diff options
Diffstat (limited to 'src/main')
59 files changed, 1899 insertions, 369 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index a754dd8..f597740 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -5,7 +5,7 @@ import java.util.function.Predicate; 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 net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; @@ -24,6 +24,7 @@ import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.event.EventNetworkChannel; import net.minecraftforge.network.simple.SimpleChannel; @Mod(NoChatReports.MODID) @@ -32,7 +33,8 @@ public class 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 packetInstance; + private static SimpleChannel channel; + private static boolean detectedOnClient = false, detectedOnServer = false; public NoChatReports() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); @@ -46,28 +48,46 @@ public class NoChatReports { NoReportsConfig.loadConfig(); } - private void onLoadComplete(final FMLLoadCompleteEvent event) { + private void onLoadComplete(FMLLoadCompleteEvent event) { // NO-OP } - private void setup(final FMLCommonSetupEvent event) { - packetInstance = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main")) + private void setup(FMLCommonSetupEvent event) { + channel = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main")) .networkProtocolVersion(() -> PTC_VERSION) - .clientAcceptedVersions(NoReportsConfig.demandsOnServer() ? PTC_VERSION::equals : ANY) - .serverAcceptedVersions(NoReportsConfig.demandsOnClient() ? PTC_VERSION::equals : ANY) + .clientAcceptedVersions(version -> { + detectedOnServer = !isAbsentOrVanilla(version); + return NoReportsConfig.demandsOnServer() ? PTC_VERSION.equals(version) : true; + }) + .serverAcceptedVersions(version -> { + detectedOnClient = !isAbsentOrVanilla(version); + return NoReportsConfig.demandsOnClient() ? PTC_VERSION.equals(version) : true; + }) .simpleChannel(); } - private void doClientStuff(final FMLClientSetupEvent event) { + private void doClientStuff(FMLClientSetupEvent event) { // NO-OP } - private void enqueueIMC(final InterModEnqueueEvent event) { + private void enqueueIMC(InterModEnqueueEvent event) { // NO-OP } - private void processIMC(final InterModProcessEvent event) { + 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 new file mode 100644 index 0000000..66110b5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -0,0 +1,112 @@ +package com.aizistral.nochatreports; + +import java.util.List; + +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen; +import com.google.common.collect.ImmutableList; + +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.network.chat.CommonComponents; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.ClientPlayerNetworkEvent; +import net.minecraftforge.client.event.ScreenEvent; +import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; + +@OnlyIn(Dist.CLIENT) +@EventBusSubscriber(modid = NoChatReports.MODID, 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 boolean screenOverride = false; + + private NoChatReportsClient() { + throw new IllegalStateException("Can't touch this"); + } + + @SubscribeEvent + public static void onScreenInit(ScreenEvent.Init.Post event) { + Minecraft client = Minecraft.getInstance(); + Screen screen = event.getScreen(); + + if (screen instanceof AccessorDisconnectedScreen dsc) { + if (screenOverride) + return; + + screenOverride = true; + if (dsc.getReason().getContents() instanceof TranslatableContents contents) { + if (ServerSafetyState.allowsUnsafeServer()) { + screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), + CommonComponents.CONNECT_FAILED, dsc.getReason()); + client.setScreen(screen); + screenOverride = false; + return; + } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { + if (ServerSafetyState.getLastConnectedServer() != null) { + if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer())) { + client.setScreen(new UnsafeServerScreen()); + } else { + if (ServerSafetyState.getReconnectCount() <= 0) { + ServerSafetyState.setAllowsUnsafeServer(true); + reconnectLastServer(); + } else { + ServerSafetyState.setReconnectCount(0); + } + } + } + } + } + screenOverride = false; + } + } + + @SubscribeEvent + public static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event) { + Minecraft client = Minecraft.getInstance(); + client.execute(ServerSafetyState::reset); + } + + @SubscribeEvent + public static void onJoin(ClientPlayerNetworkEvent.LoggingIn event) { + Minecraft client = Minecraft.getInstance(); + + client.execute(() -> { + ServerSafetyState.setReconnectCount(0); + + if (!client.isLocalServer()) { + boolean canSend = NoChatReports.isDetectedOnServer(); + + if (canSend) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else { + ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ? + ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE); + } + } + }); + } + + public static void reconnectLastServer() { + ServerSafetyState.setReconnectCount(ServerSafetyState.getReconnectCount() + 1); + ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()), Minecraft.getInstance(), + ServerSafetyState.getLastConnectedServer(), null); + } + + +} diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java new file mode 100644 index 0000000..5faead3 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -0,0 +1,281 @@ +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; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import com.aizistral.nochatreports.mixins.client.MixinChatListener; +import com.aizistral.nochatreports.mixins.client.MixinToastComponent; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; + +import net.minecraft.client.multiplayer.chat.ChatTrustLevel; +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.util.Tuple; +import net.minecraftforge.fml.loading.FMLPaths; + +/** + * Simple implementation of JSON-config for the mod. Can be loaded at any time and does not depend + * on modloader-specific API. The only disadvantage is that we don't get to comment options.<br><br> + * + * For now, the config file is called <code>NoChatReports.json</code> and is located in default config + * folder. In the future this should be separated into client and server configs. + * + * @author Aizistral + */ + +public class NoReportsConfig { + private static final Path CONFIG_FILE = FMLPaths.CONFIGDIR.get().resolve("NoChatReports.json"); + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static NoReportsConfig INSTANCE; + private boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, + convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, + hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, + alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, + showReloadButton = true; + private List<String> whitelistedServers; + + private static NoReportsConfig getInstance() { + if (INSTANCE == null) { + loadConfig(); + } + + return INSTANCE; + } + + /** + * Loads (or reloads) the config from local file, or creates default one if that fails. + * Re-searializes validated {@link #INSTANCE} object back into the file. + */ + + public static void loadConfig() { + NoChatReports.LOGGER.info(INSTANCE == null ? "Loading config..." : "Reloading config..."); + + INSTANCE = readFile(); + + if (INSTANCE == null) { + INSTANCE = new NoReportsConfig(); + } + + if (INSTANCE.whitelistedServers == null) { + INSTANCE.whitelistedServers = new ArrayList<>(); + } + + writeFile(INSTANCE); + } + + /** + * Writes current config instance into local file. + */ + + public static void saveConfig() { + if (INSTANCE != null) { + writeFile(INSTANCE); + } + } + + @Nullable + private static NoReportsConfig readFile() { + if (!Files.isRegularFile(CONFIG_FILE)) + return null; + + try (BufferedReader reader = Files.newBufferedReader(CONFIG_FILE)) { + return GSON.fromJson(reader, NoReportsConfig.class); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + private static void writeFile(NoReportsConfig instance) { + try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_FILE)) { + GSON.toJson(instance, writer); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + /** + * @return True if server with No Chat Reports installed should demand that mod is present on + * every client that tries to join. Mod's installation on client is optional otherwise.<br><br> + * + * This is false by default. + */ + + public static boolean demandsOnClient() { + return getInstance().demandOnClient; + } + + /** + * @return True if client with No Chat Reports installed should demand that mod is present on + * every server that it tries to join. In that case client will not be able to join servers that + * don't have the mod installed. Servers without the mod can still provide varying degrees of + * safety, which {@link ServerSafetyLevel} and respective icon in bottom-right corner of the chat + * screen is designed to indicate.<br><br> + * + * This is false by default. + */ + + public static boolean demandsOnServer() { + return getInstance().demandOnServer; + } + + /** + * @return True if server should convert all player messages to system messages. System messages + * do not feature signatures and look completely identical in the chat, with exception of gray line + * next to them added in pre-release 3. They are also unselectable for chat reporting.<br><br> + * + * This is true by default. + */ + + public static boolean convertToGameMessage() { + return getInstance().convertToGameMessage; + } + + /** + * @return True if current {@link ServerSafetyLevel} should be indicated on client by an icon in + * the bottom-right corner of chat screen.<br><br> + * + * This is true by default. + */ + + public static boolean showServerSafety() { + return getInstance().showServerSafety; + } + + /** + * @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 static List<String> getWhitelistedServers() { + return getInstance().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 #getWhitelistedServers()}. + * @see UnsafeServerScreen + */ + + public static boolean isWhitelistedServer(ServerAddress address) { + return getWhitelistedServers().contains(address.getHost() + ":" + address.getPort()); + } + + /** + * @return True if vanilla's unsigned messages trust indicator should be removed.<br><br> + * + * This is true by default. + * + * @see MixinChatListener#onEvaluateTrustLevel + */ + + public static boolean hideRedChatIndicators() { + return getInstance().hideRedChatIndicators; + } + + /** + * @return True if vanilla's modified/hidden messages trust indicator should be removed.<br><br> + * + * This is true by default. + * + * @see MixinChatListener#onEvaluateTrustLevel + */ + + public static boolean hideYellowChatIndicators() { + return getInstance().hideYellowChatIndicators; + } + + /** + * @return True if vanilla's system messages trust indicator should be removed.<br><br> + * + * This is true by default. + * + * @see com.aizistral.nochatreports.mixins.client.MixinGuiMessageTag#onSystem + */ + + public static boolean hideGrayChatIndicators() { + return getInstance().hideGrayChatIndicators; + } + + /** + * @return True if "Chat messages can't be verified" toast should be removed.<br><br> + * + * This is true by default. + * + * @see MixinToastComponent#onAddToast + */ + + public static boolean hideWarningToast() { + return getInstance().hideWarningToast; + } + + /** + * @return True if mod should log some additional information about its activity and message + * signatures. Generally only useful for debugging.<br><br> + * + * This is false by default. + */ + + public static boolean isDebugLogEnabled() { + return getInstance().enableDebugLog; + } + + /** + * @return True if reporting buttons should always be hidden from social interactions screen, + * instead of simply being disabled.<br><br> + * + * This is false by default. + */ + + public static boolean alwaysHideReportButton() { + return getInstance().alwaysHideReportButton; + } + + /** + * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.<br><br> + * + * This is true by default. + */ + + public static boolean versionEasterEgg() { + return getInstance().versionEasterEgg; + } + + /** + * @return True if sending telemetry to Mojang should be disabled.<br><br> + * + * This is true by default. + */ + + public static boolean disableTelemetry() { + return getInstance().disableTelemetry; + } + + /** + * @return True if the configuration reload button should be displayed in multiplayer screen. + * <br><br> + * + * This is true by default. + */ + + public static boolean showReloadButton() { + return getInstance().showReloadButton; + } + +} 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..e4cbfd3 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -0,0 +1,51 @@ +package com.aizistral.nochatreports.core; + +import com.aizistral.nochatreports.NoChatReports; + +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.Component; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +/** + * Represents the level of "safety" of the given server, in the eyes of the client. + * Current level is updated dynamically and can be obtained using {@link ServerSafetyState#getCurrent()}. + * @author Aizistral + */ + +public enum ServerSafetyLevel { + + /** + * For servers that have No Chat Reports or something of similar purpose installed, and make + * verifiable effort to remove cryptographic signature from every player message they relay. + */ + SECURE, + + + /** + * For servers that do not make any effort to remove signatures from chat messages themselves, + * but do not prohibit players from sending unsigned messages. To protect the player falls fully + * on the client of respective player in such case, and vanilla client will not do that. + */ + UNINTRUSIVE, + + /** + * For servers that have <code>enforce-secure-profile</code> enabled, or enforce signed messages + * through some other means. Users of this mod can choose to play on those servers regardless + * after being informed of danger, but there is very little mod will be able to do to protect + * them in such case. + */ + + INSECURE, + + /** + * Transient status for when evaluation of safety level is not yet complete for current server. + */ + + UNKNOWN; + + @OnlyIn(Dist.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..f7a0658 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -0,0 +1,75 @@ +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; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +/** + * All this global state is questionable, but we have to... + * @author Aizistral + */ + +@OnlyIn(Dist.CLIENT) +public class ServerSafetyState { + private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN; + private static ServerAddress lastConnectedServer = null; + private static boolean allowUnsafeServer = false, sessionRequestedKey = false; + private static int reconnectCount = 0; + + public static void updateCurrent(ServerSafetyLevel level) { + current = level; + } + + public static ServerSafetyLevel getCurrent() { + return current; + } + + public static boolean allowsUnsafeServer() { + return current != ServerSafetyLevel.SECURE ? allowUnsafeServer : false; + } + + public static void setAllowsUnsafeServer(boolean allows) { + allowUnsafeServer = allows; + } + + public static void setSessionRequestedKey(boolean requested) { + sessionRequestedKey = requested; + } + + public static boolean sessionRequestedKey() { + return current != ServerSafetyLevel.SECURE ? sessionRequestedKey : false; + } + + public static boolean forceSignedMessages() { + return allowsUnsafeServer() && sessionRequestedKey(); + } + + @Nullable + public static ServerAddress getLastConnectedServer() { + return lastConnectedServer; + } + + public static void setLastConnectedServer(@Nullable ServerAddress address) { + lastConnectedServer = address; + } + + public static int getReconnectCount() { + return reconnectCount; + } + + public static void setReconnectCount(int count) { + reconnectCount = count; + } + + public static void reset() { + current = ServerSafetyLevel.UNKNOWN; + allowUnsafeServer = sessionRequestedKey = false; + } + +} 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..9780e41 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -0,0 +1,68 @@ +package com.aizistral.nochatreports.gui; + +import javax.print.attribute.standard.MediaSize.NA; + +import com.aizistral.nochatreports.NoChatReportsClient; +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; + +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; +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 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(); + } + + ServerSafetyState.setAllowsUnsafeServer(true); + NoChatReportsClient.reconnectLastServer(); + } + })); + 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/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java deleted file mode 100644 index 055fcbd..0000000 --- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.aizistral.nochatreports.handlers; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Optional; - -import javax.annotation.Nullable; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.fml.loading.FMLPaths; - -public class NoReportsConfig { - private static final Path CONFIG_FILE = FMLPaths.CONFIGDIR.get().resolve("NoChatReports.json"); - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static NoReportsConfig INSTANCE; - private boolean demandOnClient, demandOnServer, convertToGameMessage; - - public static void loadConfig() { - INSTANCE = readFile(); - - if (INSTANCE == null) { - INSTANCE = new NoReportsConfig(); - //INSTANCE.demandOnServer = true; - } - - writeFile(INSTANCE); - } - - @Nullable - private static NoReportsConfig readFile() { - if (!Files.isRegularFile(CONFIG_FILE)) - return null; - - try (BufferedReader reader = Files.newBufferedReader(CONFIG_FILE)) { - return GSON.fromJson(reader, NoReportsConfig.class); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } - - private static void writeFile(NoReportsConfig instance) { - try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_FILE)) { - GSON.toJson(instance, writer); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - - public static boolean demandsOnClient() { - return INSTANCE.demandOnClient; - } - - public static boolean demandsOnServer() { - return INSTANCE.demandOnServer; - } - - public static boolean convertsToGameMessage() { - return INSTANCE.convertToGameMessage; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java deleted file mode 100644 index 92d3d59..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.client.multiplayer.PlayerInfo; -import net.minecraft.network.chat.PlayerChatMessage; -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; - -@Mixin(ClientPacketListener.class) -public class MixinClientPacketListener { - - /** - * @reason Prevents client from trying to validate chat messages relayed - * by the server. They will come unsigned as in good old days, so no point. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "hasValidSignature", at = @At("HEAD"), cancellable = true) - private void hasValidSignature(PlayerChatMessage message, PlayerInfo info, CallbackInfoReturnable<Boolean> cir) { - cir.setReturnValue(true); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java deleted file mode 100644 index 1837cb5..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import com.mojang.authlib.minecraft.TelemetrySession; -import com.mojang.authlib.minecraft.UserApiService; -import net.minecraft.client.ClientTelemetryManager; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.util.concurrent.Executor; - -@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 redirectNewTelemetrySession(UserApiService service, Executor executor) { - return TelemetrySession.DISABLED; - } - -}
\ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java deleted file mode 100644 index ac0e981..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import net.minecraft.server.dedicated.DedicatedServer; -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; - -@Mixin(DedicatedServer.class) -public class MixinDedicatedServer { - - /** - * @reason If we are present on server - we won't be using keys for anything, - * so this option ceases to make sense. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "enforceSecureProfile", at = @At("HEAD"), cancellable = true) - private void enforceSecureProfile(CallbackInfoReturnable<Boolean> cir) { - cir.setReturnValue(false); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java deleted file mode 100644 index 9ce128c..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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.Component; -import net.minecraft.network.chat.MessageSignature; -import net.minecraft.network.chat.MessageSigner; -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; - -@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 (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) - private void signMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> cir) { - cir.setReturnValue(MessageSignature.unsigned()); - } - - /** - * @reason Same as above, except commands mostly concern only server. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true) - private void signCommandArguments(MessageSigner signer, ParseResults<SharedSuggestionProvider> parseResults, Component message, CallbackInfoReturnable<ArgumentSignatures> cir) { - cir.setReturnValue(ArgumentSignatures.empty()); - } -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java deleted file mode 100644 index 28fab76..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; -import net.minecraft.client.multiplayer.ProfileKeyPairManager; -import net.minecraft.network.protocol.login.ClientboundHelloPacket; -import net.minecraft.util.Signer; -import net.minecraft.world.entity.player.ProfilePublicKey; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.Optional; - -@Mixin(ProfileKeyPairManager.class) -public class MixinProfileKeyPairManager { - - /** - * @reason We don't have to send our keys anywhere, and thus we won't. - * @author Aizistral - */ - - @Overwrite - public Optional<ProfilePublicKey> profilePublicKey() { - return Optional.empty(); - } - - /** - * @reason We don't have to send our keys anywhere, and thus we won't. - * @author Aizistral - */ - - @Overwrite - public Optional<ProfilePublicKey.Data> profilePublicKeyData() { - return Optional.empty(); - } - - /** - * @reason Prevent client from trying to produce signature in - * {@link ClientHandshakePacketListenerImpl#handleHello(ClientboundHelloPacket)}. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "signer", at = @At("HEAD"), cancellable = true) - private void signer(CallbackInfoReturnable<Signer> cir) { - cir.setReturnValue(null); - } - - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java deleted file mode 100644 index 88b7ba5..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.handlers.NoReportsConfig; - -import net.minecraft.core.Registry; -import net.minecraft.network.chat.ChatDecoration; -import net.minecraft.network.chat.ChatType; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; -import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; -import net.minecraft.resources.ResourceKey; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.server.network.ServerPlayerConnection; - -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.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ServerGamePacketListenerImpl.class) -public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerConnection { - - /** - * @reason Convert player message to system message if mod is configured respectively. - * This allows to circumvent signature check on client, as it only checks player messages. - * @author JFronny (original implementation) - * @author Aizistral - */ - - @Inject(method = "send", at = @At("HEAD"), cancellable = true) - private void onSend(Packet<?> packet, CallbackInfo info) { - if (NoReportsConfig.convertsToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { - Component component = chat.unsignedContent().orElse(chat.signedContent()); - component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); - packet = new ClientboundSystemChatPacket(component, this.resolveChatTypeID(ChatType.SYSTEM)); - - info.cancel(); - this.send(packet); - } - } - } - - private int resolveChatTypeID(ResourceKey<ChatType> resourceKey) { - var self = (ServerGamePacketListenerImpl) (Object) this; - Registry<ChatType> registry = self.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY); - return registry.getId(registry.get(resourceKey)); - } - -}
\ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java deleted file mode 100644 index 53044b8..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import net.minecraft.network.chat.MessageSignature; -import net.minecraft.network.protocol.game.ServerboundChatPacket; -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 java.util.UUID; - -@Mixin(ServerboundChatPacket.class) -public class MixinServerboundChatPacket { - - /** - * @reason Strip signatures before relaying messages to other clients, - * if they somehow arrive signed. This is important for mod to be able - * to operate in server-only mode. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "getSignature", at = @At("HEAD"), cancellable = true) - private void getSignature(UUID uuid, CallbackInfoReturnable<MessageSignature> cir) { - cir.setReturnValue(MessageSignature.unsigned()); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java new file mode 100644 index 0000000..c5311cf --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java @@ -0,0 +1,24 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +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/MixinBrandingControl.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java index 2500163..dedaac0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinBrandingControl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins; +package com.aizistral.nochatreports.mixins.client; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -10,6 +10,11 @@ import net.minecraftforge.versions.mcp.MCPVersion; @Mixin(value = BrandingControl.class, remap = false) public class MixinBrandingControl { + /** + * @reason Replace "1.19.1" with "1.19.84" in title screen. No functional purpose. + * @author Aizistral + */ + @Redirect(method = "computeBranding", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/versions/mcp/MCPVersion;getMCVersion()Ljava/lang/String;")) private static String onGetMCVersion() { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java new file mode 100644 index 0000000..274e67e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -0,0 +1,77 @@ +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.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.core.NoReportsConfig; + +import net.minecraft.client.multiplayer.PlayerInfo; +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.PlayerChatMessage; + +@Mixin(ChatListener.class) +public class MixinChatListener { + + @Shadow + private boolean isSenderLocalPlayer(UUID uuid) { + throw new IllegalStateException("@Shadow transformation failed. Should never happen."); + } + + /** + * @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 + * try to protect them by stripping message signatures. + * @author Aizistral + */ + + @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())) { + info.setReturnValue(ChatTrustLevel.SECURE); + } else { + var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant); + + if ((evaluate == ChatTrustLevel.NOT_SECURE || evaluate == ChatTrustLevel.BROKEN_CHAIN) + && NoReportsConfig.hideRedChatIndicators()) { + info.setReturnValue(ChatTrustLevel.SECURE); + } else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED) + && NoReportsConfig.hideYellowChatIndicators()) { + info.setReturnValue(ChatTrustLevel.SECURE); + } + } + + // Debug never dies + if (NoReportsConfig.isDebugLogEnabled()) { + NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", + Component.Serializer.toStableJson(playerChatMessage.serverContent()), + playerChatMessage.signer().profileId(), + Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes())); + } + } + + /** + * @reason Prevent client from disconnecting when chat chain is broken. + * Normal average user will not even understand what happened, so this is absolutely + * useless for them. + * @author Aizistral + */ + + @Inject(method = "onChatChainBroken", at = @At("HEAD"), cancellable = true) + private void stopUselessDisconnects(CallbackInfo info) { + info.cancel(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java new file mode 100644 index 0000000..aecaaec --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java @@ -0,0 +1,65 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.OptionInstance; +import net.minecraft.client.Options; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.ChatOptionsScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.SimpleOptionsSubScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; + +import java.util.List; + +@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) { + 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(); + 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; + } + } + + /** + * 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 (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); + } + } +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java new file mode 100644 index 0000000..f0b4b34 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -0,0 +1,154 @@ +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 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; + +/** + * This is responsible for adding safety status indicator to the bottom-right corner of chat screen. + * @author Aizistral + */ + +@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() { + super(null); + 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; + }; + } + + 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 : 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/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java new file mode 100644 index 0000000..7a5aaf9 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.aizistral.nochatreports.core.NoReportsConfig; +import net.minecraft.client.ClientTelemetryManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ClientTelemetryManager.class) +public class MixinClientTelemetryManager { + + /** + * @reason Privacy. + * @author Aizistral + */ + + @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/SharedConstants;IS_RUNNING_IN_IDE:Z")) + private boolean disableTelemetrySession() { + return NoReportsConfig.disableTelemetry(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java new file mode 100644 index 0000000..dfb94ad --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java @@ -0,0 +1,30 @@ +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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +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) { + 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 new file mode 100644 index 0000000..6b3fcf1 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -0,0 +1,42 @@ +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.core.NoReportsConfig; +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; + +@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 + * @author Aizistral + */ + + @Inject(method = "startConnecting", at = @At("HEAD")) + private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, + @Nullable ServerData serverData, CallbackInfo info) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure + ServerSafetyState.setLastConnectedServer(serverAddress); + + if (NoReportsConfig.isDebugLogEnabled()) { + NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}", + serverAddress.getHost() + ":" + serverAddress.getPort(), + ServerSafetyState.allowsUnsafeServer()); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java new file mode 100644 index 0000000..1edcf7e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -0,0 +1,29 @@ +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.CallbackInfoReturnable; + +import com.aizistral.nochatreports.core.NoReportsConfig; + +import net.minecraft.client.GuiMessageTag; + +@Mixin(GuiMessageTag.class) +public class MixinGuiMessageTag { + + /** + * @reason Remove gray bar as indication besides system messages, if mod is configured + * respectively. The mod can convert all player messages to system messages when + * installed on server, so we don't need that most of the time. + * @author Aizistral + */ + + @Inject(method = "system", at = @At("HEAD"), cancellable = true) + private static void onSystem(CallbackInfoReturnable<GuiMessageTag> info) { + if (NoReportsConfig.hideGrayChatIndicators()) { + info.setReturnValue(null); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java new file mode 100644 index 0000000..e9f6395 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -0,0 +1,139 @@ +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 com.aizistral.nochatreports.core.NoReportsConfig; +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.gui.components.ImageButton; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +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; + +/** + * This is responsible for adding config reload button to server selection menu. + * @author Aizistral + */ + +@Mixin(JoinMultiplayerScreen.class) +public abstract class MixinJoinMultiplayerScreen extends Screen { + private static final ResourceLocation RELOAD_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/config_reload_button.png"); + private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatrepords.reload_config_tooltip"); + + protected MixinJoinMultiplayerScreen() { + super(null); + throw new IllegalStateException("Can't touch this"); + } + + @Inject(method = "init", at = @At("HEAD")) + private void onInit(CallbackInfo info) { + if (!NoReportsConfig.showReloadButton()) + return; + + var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20, RELOAD_TEXTURE, + 64, 64, btn -> NoReportsConfig.loadConfig(), (btn, poseStack, i, j) -> + this.renderTooltipNoGap(poseStack, this.minecraft.font.split(RELOAD_TOOLTIP, 250), i, j), + Component.translatable("gui.nochatrepords.reload_config")); + 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 : 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/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java new file mode 100644 index 0000000..57ce4bb --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java @@ -0,0 +1,56 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.brigadier.ParseResults; + +import net.minecraft.Util; +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; +import net.minecraft.util.Crypt; +import net.minecraft.util.Crypt.SaltSignaturePair; + +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 java.time.Instant; + +import javax.annotation.Nullable; + +@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 (!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 (!ServerSafetyState.forceSignedMessages()) { + info.setReturnValue(ArgumentSignatures.EMPTY); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java index 8c4c86e..3d1e002 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java @@ -1,4 +1,7 @@ -package com.aizistral.nochatreports.mixins; +package com.aizistral.nochatreports.mixins.client; + +import java.time.Instant; +import java.util.UUID; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -6,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.NoReportsConfig; +import com.mojang.authlib.minecraft.BanDetails; import com.mojang.authlib.minecraft.UserApiService; import net.minecraft.client.Minecraft; @@ -15,11 +20,19 @@ import net.minecraft.world.entity.player.ChatVisiblity; @Mixin(Minecraft.class) public class MixinMinecraft { + /** + * @reason Replace "1.19.1" with "1.19.84" in game window title. No functional purpose. + * @author Aizistral + */ + @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0) private void onCreateTitle(CallbackInfoReturnable<String> info) { - if (info.getReturnValue().endsWith("1.19.1")) { + if (!NoReportsConfig.versionEasterEgg()) + return; + + if (info.getReturnValue().contains("1.19.1")) { info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84")); } } -}
\ No newline at end of file +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java index be46634..3c26b86 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java @@ -1,4 +1,5 @@ -package com.aizistral.nochatreports.mixins; + +package com.aizistral.nochatreports.mixins.client; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; @@ -17,20 +18,19 @@ public class MixinOptions { /** * @reason Disable secure chat option, since it will not work anyways. - * @author Aizistral (Overwrite) - * @author Aven (Inject) + * @author Aizistral */ - @Inject(method = "onlyShowSecureChat", at = @At("HEAD"), cancellable = true) + @Inject(method = "onlyShowSecureChat", at = @At("RETURN"), cancellable = true) private void onlyShowSecureChat(CallbackInfoReturnable<OptionInstance<Boolean>> cir) { 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) -> {}); + 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 new file mode 100644 index 0000000..4610f4d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -0,0 +1,77 @@ +package com.aizistral.nochatreports.mixins.client; + +import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.Supplier; + +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.core.NoReportsConfig; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +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.screens.reporting.ChatReportScreen; +import net.minecraft.client.gui.screens.social.PlayerEntry; +import net.minecraft.client.gui.screens.social.SocialInteractionsScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FormattedCharSequence; + +@Mixin(PlayerEntry.class) +public class MixinPlayerEntry { + private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreport.noReporting"); + @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. + * @author Aizistral + */ + + @Inject(method = "<init>", at = @At("RETURN")) + private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier<ResourceLocation> supplier, boolean reportable, CallbackInfo info) { + if (NoReportsConfig.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.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")); + 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 new file mode 100644 index 0000000..e1dc8f2 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java @@ -0,0 +1,59 @@ +package com.aizistral.nochatreports.mixins.client; + +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.client.multiplayer.ProfileKeyPairManager; +import net.minecraft.util.Signer; +import net.minecraft.world.entity.player.ProfilePublicKey; +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.NoChatReports; +import com.aizistral.nochatreports.core.ServerSafetyState; + +import java.util.Optional; + +@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 (!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 + */ + + @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) + private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { + 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 (!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 new file mode 100644 index 0000000..9d8a3a5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java @@ -0,0 +1,30 @@ +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.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.realmsclient.dto.RealmsServer; + +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.realms.RealmsConnect; + +@Mixin(RealmsConnect.class) +public class MixinRealmsConnect { + + /** + * @reason Always treat Realms servers as insecure, there is nothing we can do about them. + * @author Aizistral + */ + + @Inject(method = "connect", at = @At("HEAD")) + private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) { + ServerSafetyState.setLastConnectedServer(serverAddress); + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowsUnsafeServer(true); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java new file mode 100644 index 0000000..36cfe7e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java @@ -0,0 +1,26 @@ +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.core.NoReportsConfig; + +import net.minecraft.client.gui.components.toasts.SystemToast; +import net.minecraft.client.gui.components.toasts.SystemToast.SystemToastIds; +import net.minecraft.client.gui.components.toasts.Toast; +import net.minecraft.client.gui.components.toasts.ToastComponent; + +@Mixin(ToastComponent.class) +public class MixinToastComponent { + + @Inject(method = "addToast", at = @At("HEAD"), cancellable = true) + private void onAddToast(Toast toast, CallbackInfo info) { + if (NoReportsConfig.hideWarningToast()) + if (toast instanceof SystemToast sys && sys.getToken() == SystemToastIds.UNSECURE_SERVER_WARNING) { + info.cancel(); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java new file mode 100644 index 0000000..2ec92b7 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins.server; + +import net.minecraft.server.dedicated.DedicatedServer; +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; + +@Mixin(DedicatedServer.class) +public class MixinDedicatedServer { + + /** + * @reason If mod is installed on server - it does the exact opposite of what this option is + * designed to enforce, so there's no reason to have it enabled. + * @author Aizistral + */ + + @Inject(method = "enforceSecureProfile", at = @At("RETURN"), cancellable = true) + private void onEnforceSecureProfile(CallbackInfoReturnable<Boolean> cir) { + cir.setReturnValue(false); + } + +}
\ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java index 5dd12a7..780d93c 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java @@ -1,10 +1,12 @@ -package com.aizistral.nochatreports.mixins; +package com.aizistral.nochatreports.mixins.server; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.ProfilePublicKey; 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; @Mixin(Player.class) @@ -13,13 +15,12 @@ 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 (Overwrite) - * @author Aven (Inject) + * @author Aizistral */ @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true) - private void getProfilePublicKey(CallbackInfoReturnable<ProfilePublicKey> cir) { - cir.setReturnValue(null); + 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 new file mode 100644 index 0000000..79a6959 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java @@ -0,0 +1,25 @@ +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.network.chat.ChatSender; +import net.minecraft.network.chat.PlayerChatMessage; +import net.minecraft.server.players.PlayerList; + +@Mixin(PlayerList.class) +public class MixinPlayerList { + + /** + * @reason Remove "Not Secure" mark in server chat logs. + * @author Aizistral + */ + + @Inject(method = "verifyChatTrusted", at = @At("HEAD"), cancellable = true) + private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, ChatSender chatSender, 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 new file mode 100644 index 0000000..2226193 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -0,0 +1,70 @@ +package com.aizistral.nochatreports.mixins.server; + +import com.aizistral.nochatreports.core.NoReportsConfig; + +import net.minecraft.core.Registry; +import net.minecraft.network.PacketSendListener; +import net.minecraft.network.chat.ChatTypeDecoration; +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; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.server.network.ServerPlayerConnection; + +import org.jetbrains.annotations.Nullable; +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(ServerGamePacketListenerImpl.class) +public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerConnection { + @Shadow + public ServerPlayer player; + + /** + * @reason Convert player message to system message if mod is configured respectively. + * This allows to circumvent signature check on client, as it only checks player messages. + * @author JFronny (original implementation) + * @author Aizistral + */ + + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) + private void onSend(Packet<?> packet, CallbackInfo info) { + if (NoReportsConfig.convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatHeaderPacket) { + info.cancel(); + } else if (packet instanceof ClientboundPlayerChatPacket chat) { + packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) + .get().decorate(chat.message().serverContent()), false); + + + info.cancel(); + this.send(packet); + } + } + } + + /** + * @reason Ensure conversion works regardless of which send method is used. + * @author Aizistral + */ + + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V", + at = @At("HEAD"), cancellable = true) + private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { + if (NoReportsConfig.convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatHeaderPacket) { + info.cancel(); + } else 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/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java new file mode 100644 index 0000000..3a544d3 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java @@ -0,0 +1,27 @@ +package com.aizistral.nochatreports.mixins.server; + +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.core.NoReportsConfig; + +import net.minecraft.network.protocol.game.ClientboundServerDataPacket; +import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; + +@Mixin(ServerStatus.class) +public class MixinServerStatus { + + @Inject(method = "enforcesSecureChat", at = @At("HEAD"), cancellable = true) + public void onSecureChatCheck(CallbackInfoReturnable<Boolean> info) { + if (NoReportsConfig.convertToGameMessage()) { + info.setReturnValue(true); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java new file mode 100644 index 0000000..15cca37 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java @@ -0,0 +1,32 @@ +package com.aizistral.nochatreports.mixins.server; + +import net.minecraft.Util; +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.protocol.game.ServerboundChatPacket; +import net.minecraft.util.Crypt.SaltSignaturePair; + +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.core.NoReportsConfig; + +import java.util.UUID; + +@Mixin(ServerboundChatPacket.class) +public class MixinServerboundChatPacket { + + /** + * @reason Strip signatures before relaying messages to other clients, if they arrive signed + * This is important for mod to be able to operate in server-only mode without + * {@link NoReportsConfig#convertToGameMessage()} enabled. + * @author Aizistral + */ + + @Inject(method = "signature", at = @At("RETURN"), cancellable = true) + private void onGetSignature(CallbackInfoReturnable<MessageSignature> info) { + info.setReturnValue(MessageSignature.EMPTY); + } + +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..d38c691 --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1 @@ +public net.minecraft.client.gui.screens.SimpleOptionsSubScreen f_96668_ #list
\ No newline at end of file diff --git a/src/main/resources/assets/nochatreports/lang/ca_es.json b/src/main/resources/assets/nochatreports/lang/ca_es.json new file mode 100644 index 0000000..42f92d7 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/ca_es.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Aquesta opció no pot funcionar amb No Chat Reports, ja que no n'hi ha signatures per a verificar.", + "gui.nochatreport.noReporting": "Els reports del xat hi són deshabilitats en aquest servidor, cortesia de No Chat Reports.", + "disconnect.nochatreports.client": "Aquest servidor no té No Chat Reports, i vostè el té configurat perquè sigui requerit al servidor.", + "gui.nochatreports.status_secure": "Aquest servidor té No Chat Reports instal·lat, o preveu que els seus missatges siguin reportats d'altra forma coneguda. Pots xatejar amb seguretat.", + "gui.nochatreports.status_unintrusive": "Aquest servidor no evita els reports de xat, però permet que enviïs missatges sense signatura. Tècnicament - encara poden ser reportats a Mojang, però generalment, no seran considerats evidencia vàlida, i és poc probable que es prengui alguna mesura sobre aquests.", + "gui.nochatreports.status_insecure": "Aquest servidor demana que tots els missatges enviats per jugadors tinguin signatura, i vostè ha estat d'acord amb aquests termes. Tot el que enviïs en el xat pot ser usat com a evidència incriminatòria en la seva contra en el report. Pots eliminar aquest servidor de NoChatReports.json en la teva carpeta de configuració manualment per a no ser advertit altra vegada.", + "gui.nochatreports.status_unknown": "No Chat Reports no ha pogut avaluar la seguretat d'aquest servidor. Això no deuria haver passat, si us plau informi d'aquest error al desenvolupador d'aquest mod.", + "gui.nochatreports.unsafe_server.header": "Precaució: Servidor insegur", + "gui.nochatreports.unsafe_server.contents": "Aquest servidor requereix que tots els missatges tinguin signatura, això significa que poden ser reportats a Mojang. Això probablement significa que el propietari del servidor ha mantingut 'enforce-secure-profile' habilitat en server.properties, que és el valor per defecte des de 1.19.1. Pots escollir jugar de totes formes, però No Chat Reports podrà protegir-te.", + "gui.nochatreports.unsafe_server.check": "No tornar a mostrar per aquest servidor.", + "gui.nochatrepords.reload_config_tooltip": "Recarregar la configuració de No Chat Reports. Utilitzar amb compte." +} diff --git a/src/main/resources/assets/nochatreports/lang/cs_cz.json b/src/main/resources/assets/nochatreports/lang/cs_cz.json new file mode 100644 index 0000000..4442677 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/cs_cz.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Tato možnost nemůže fungovat s No Chat Reports, protože nejsou žádné digitální podpisy pro ověření.", + "gui.nochatreport.noReporting": "Nahlašování v chatu je na tomto serveru zakázáno, díky No Chat Reports.", + "disconnect.nochatreports.client": "Tento server nemá No Chat Reports, ale nakonfigurovali jste jej tak, aby byl na serveru vyžadován.", + "gui.nochatreports.status_secure": "Tento server má naninstalované No Chat Reports, nebo zabraňuje aby vaše zprávy mohly být nahlašovatelné jiným známým způsobem. Můžete bezpečně chatovat.", + "gui.nochatreports.status_unintrusive": "Tento server nezabraňuje nahlašování zpráv, ale povoluje odesílání nepodepsaných zpráv. Technicky vzato - mohou stále být nahlášeny Mojangu, ale většinou nejsou považovány za platné důkazy, a je nepravděpodobné, že by na základě těchto zpráv byla přijata jakákoli opatření.", + "gui.nochatreports.status_insecure": "Tento server vyžaduje, aby všechny zprávy byly podepsané, a vy jste souhlasili s tímto nastavením. Všechno co odešlete do chatu je potenciálně usvědčující důkaz, který může být použit proti vám v hlášení. Můžete manuálně odebrat tento server z NoChatReports.json ve vaší 'config' složce, aby jste znovu dostali varování.", + "gui.nochatreports.status_unknown": "No Chat Reports nemůže vyhodnotit bezpečnost tohoto serveru. Toto by se nikdy nemělo stát, prosím nahlašte to jako chybu vývojáři modu.", + "gui.nochatreports.unsafe_server.header": "Pozor: Nezabezpečený Server", + "gui.nochatreports.unsafe_server.contents": "Tento server vyžaduje, aby všechny zprávy v chatu byly podepsané, což znamená, že je lze nahlásit Mojangu. To pravděpodobně znamená, že majitel serveru ponechal volbu 'enforce-secure-profile' povolenou v server.properties, což je výchozí nastavení od verze 1.19.1. Můžete se rozhodnout hrát i tak, ale No Chat Reports vás nebude moci ochránit.", + "gui.nochatreports.unsafe_server.check": "Znovu neukazovat pro tento server", + "gui.nochatrepords.reload_config_tooltip": "Znovu načíst No Chat Reports nastavení. Používejte opatrně." +} diff --git a/src/main/resources/assets/nochatreports/lang/de_de.json b/src/main/resources/assets/nochatreports/lang/de_de.json index e3e2406..cab5eb4 100644 --- a/src/main/resources/assets/nochatreports/lang/de_de.json +++ b/src/main/resources/assets/nochatreports/lang/de_de.json @@ -1,5 +1,13 @@ { "gui.nochatreport.secureChat": "Diese Option kann nicht mit No Chat Reports verwendet werden, da keine Signaturen zum Verifizieren vorhanden sind.", "gui.nochatreport.noReporting": "Nachrichten melden ist auf diesem Server dank No Chat Reports deaktiviert.", - "disconnect.nochatreports.client": "Dieser Server hat No Chat Reports nicht installiert, aber du hast eingestellt, dass es auf Servern notwendig ist." + "disconnect.nochatreports.client": "Dieser Server hat No Chat Reports nicht installiert, aber du hast eingestellt, dass es auf Servern notwendig ist.", + "gui.nochatreports.status_secure": "Dieser Server hat No Chat Reports installiert oder verhindert das Melden von Nachrichten auf eine andere bekannte Weise. Niemand sieht einen roten Balken, ein (!) Symbol oder kann Nachrichten mit \"Nur sicheren Chat anzeigen\" verstecken. Du kannst sicher chatten.", + "gui.nochatreports.status_unintrusive": "Dieser Server erlaubt dir, unsignierte Nachrichten zu schicken, welche nicht an Mojang gemeldet werden können. Vanilla-Clients sehen jedoch einen roten Balken links sowie ein (!) Symbol rechts von deinen Nachrichten und Spieler, die die Option \"Nur sicheren Chat anzeigen\" aktivieren, sehen deine Nachrichten überhaupt nicht.", + "gui.nochatreports.status_insecure": "Dieser Server verlangt, dass alle Chatnachrichten signiert sind, und du hast dieser Anforderung zugestimmt. Alles, was du in den Chat schreibst, ist ein potenziell belastender Beweis und kann in Meldungen gegen dich verwendet werden. Du kannst den Server manuell aus der NoChatReports.json im config-Ordner entfernen, um wieder gewarnt zu werden.", + "gui.nochatreports.status_unknown": "No Chat Reports konnte die Sicherheit dieses Servers nicht einschätzen. Dies sollte niemals vorkommen, bitte melde es dem Mod-Entwickler als einen Bug.", + "gui.nochatreports.unsafe_server.header": "Vorsicht: unsicherer Server", + "gui.nochatreports.unsafe_server.contents": "Dieser Server verlangt, dass alle Chatnachrichten signiert sind, was bedeutet, dass sie an Mojang gemeldet werden können, was zu einem Bann aus dem gesamten Mehrspieler führen kann. Wahrscheinlich hat der Server-Besitzer \"enforce-secure-profile\" in der server.properties aktiviert gelassen, was seit der 1.19.1 der Standardwert ist. Du kannst trotzdem spielen, aber No Chat Reports kann dich nicht schützen.", + "gui.nochatreports.unsafe_server.check": "Nicht nochmal anzeigen für diesen Server", + "gui.nochatrepords.reload_config_tooltip": "No Chat Reports Konfigurationsdatei neu laden. Nutze dies mit Bedacht." } diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 28caa07..97c69da 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -1,3 +1,13 @@ { - "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify." -}
\ No newline at end of file + "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.", + "gui.nochatreports.status_secure": "This server has No Chat Reports installed or prevents everyone's messages from being reportable in some other known way. Nobody will see a red bar, (!) symbol or can hide messages with \"Only Show Secure Chat\". You can chat safely.", + "gui.nochatreports.status_unintrusive": "This server allows you to send unsigned messages, which cannot be reported to Mojang. However, for vanilla clients the messages will show a red bar on the left, (!) symbol on the right and players enabling the option \"Only Show Secure Chat\" won't see your messages at all.", + "gui.nochatreports.status_insecure": "This server demands all chat messages to be signed and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can manually remove this server from NoChatReports.json in your config folder to get warned again.", + "gui.nochatreports.status_unknown": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.", + "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", + "gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.", + "gui.nochatreports.unsafe_server.check": "Do not show again for this server", + "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully." +} diff --git a/src/main/resources/assets/nochatreports/lang/es_es.json b/src/main/resources/assets/nochatreports/lang/es_es.json new file mode 100644 index 0000000..95fb399 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/es_es.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Esta opción no puede funcionar con No Chat Reports, ya que no hay signaturas para verificar.", + "gui.nochatreport.noReporting": "Los reportes de chat están deshabilitados en este servidor, cortesía de No Chat Reports.", + "disconnect.nochatreports.client": "Este servidor no tiene No Chat Reports, y usted lo tiene configurado para que sea requerido en el servidor.", + "gui.nochatreports.status_secure": "Este servidor tiene No Chat Reports instalado, o previene que sus mensajes sean reportados de algún otro modo conocido. Puedes chatear con seguridad.", + "gui.nochatreports.status_unintrusive": "Este servidor no previene reportes de chat, pero permite que envíes mensajes sin signatura. Técnicamente - todavía pueden ser reportados a Mojang, pero generalmente, no serán considerados evidencia válida, y es poco probable que se tome alguna medida sobre ellos.", + "gui.nochatreports.status_insecure": "Este servidor demanda que todos los mensajes enviados por jugadores tengan signatura, y usted estuvo de acuerdo con estos términos. Todo lo que envíes en el chat puede ser usado como evidencia incriminativa en su contra en el reporte. Puedes remover este servidor de NoChatReports.json en tu carpeta de configuración manualmente para no ser advertido de vuelta.", + "gui.nochatreports.status_unknown": "No Chat Reports no pudo evaluar la seguridad de este servidor. Esto no debería pasar, por favor informe de este error al desarrollador de este mod.", + "gui.nochatreports.unsafe_server.header": "Precaución: Servidor inseguro", + "gui.nochatreports.unsafe_server.contents": "Este servidor requiere que todos los mensajes tengan signatura, lo que significa que pueden ser reportados a Mojang. Esto probablemente significa que el dueño del servidor mantuvo 'enforce-secure-profile' habilitado en server.properties, el cual es el valor por defecto desde 1.19.1. Puedes elegir jugar de todos modos, pero No Chat Reports no será capaz de protegerte.", + "gui.nochatreports.unsafe_server.check": "No mostrar de vuelta para este servidor.", + "gui.nochatrepords.reload_config_tooltip": "Recargar la configuración de No Chat Reports. Usar con cuidado." +} diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json new file mode 100644 index 0000000..048c7d7 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "See funktsioon ei saa töötada modiga No Chat Reports, kuna kinnitatavad signatuurid puuduvad.", + "gui.nochatreport.noReporting": "Selles serveris on mängijast teatamine keelatud modi No Chat Reports olemasolu tõttu.", + "disconnect.nochatreports.client": "Sellest serverist puudub mod No Chat Reports ning sinu seadistused nõuavad selle olemasolu serveris.", + "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab kõigi sõnumitest teatamist mõnel muul teadaoleval viisil. Keegi ei näe punast riba, (!)-sümbolit ega saa sõnumeid peita valikuga \"Vaid turvaline vestlus\". Sa saad turvaliselt vestelda.", + "gui.nochatreports.status_unintrusive": "See server võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Siiski, vanilliklientidele kuvavad need sõnumid vasakul punast riba, paremal (!)-sümbolit ning igaüks, kes lubab valiku \"Vaid turvaline vestlus\" ei näe su sõnumeid üldse.", + "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri käsitsi config kaustas olevast NoChatReports.json failist eemaldada.", + "gui.nochatreports.status_unknown": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.", + "gui.nochatreports.unsafe_server.header": "Hoiatus: ebaturvaline server", + "gui.nochatreports.unsafe_server.contents": "See server nõuab kõikide vestlussõnumite signeerimist, seega neid saab Mojangile raporteerida ning tagajärjeks võib olla blokeering kõigist mitmikmängu serveritest. See tõenäoliselt tähendab, et serveri omanik jättis failis server.properties valiku \"enforce-secure-profile\" lubatuks, mis on ka vaikeväärtus alates versioonist 1.19.1. Sa võid siiski seal mängida, kuid No Chat Reports ei saa sind kaitsta.", + "gui.nochatreports.unsafe_server.check": "Ära kuva selle serveri puhul uuesti", + "gui.nochatrepords.reload_config_tooltip": "Laadi No Chat Reports seadistus uuesti. Kasuta ettevaatlikult." +} diff --git a/src/main/resources/assets/nochatreports/lang/fr_fr.json b/src/main/resources/assets/nochatreports/lang/fr_fr.json index b29ca6d..9bb2e5c 100644 --- a/src/main/resources/assets/nochatreports/lang/fr_fr.json +++ b/src/main/resources/assets/nochatreports/lang/fr_fr.json @@ -1,5 +1,13 @@ { - "gui.nochatreport.secureChat": "Cette option ne fonctionne pas avec No Chat Reports puisqu'il n'y a pas de signature à vérifier.", - "gui.nochatreport.noReporting": "Les signalements de chat sont désactivés sur ce serveur grâce à No Chat Reports.", - "disconnect.nochatreports.client": "Ce serveur n'a pas No Chat Reports et vous avez configuré que vous le vouliez toujours." + "gui.nochatreport.secureChat": "Cette option ne fonctionne pas avec No Chat Reports, puisqu'il n'y a pas de signature à vérifier.", + "gui.nochatreport.noReporting": "Les signalements sont désactivés sur ce serveur grâce à No Chat Reports.", + "disconnect.nochatreports.client": "Ce serveur n'a pas No Chat Reports et vous avez configuré que vous le vouliez toujours.", + "gui.nochatreports.status_secure": "Ce serveur a No Chat Reports installé, ou empêche vos messages d'être signalés d'une autre manière. Vous pouvez discuter en toute sécurité.", + "gui.nochatreports.status_unintrusive": "Ce serveur n'empêche pas les signalements, mais vous permet d'envoyer des messages non signés. Techniquement, ils peuvent toujours être signalés à Mojang, mais ne sont généralement pas considérés comme des preuves valides. Il est peu probable que des mesures soient prises sur de tels signalements.", + "gui.nochatreports.status_insecure": "Ce serveur exige que tous les messages des joueurs soient signés et vous avez accepté ces conditions. Tout ce que vous envoyez dans le chat est potentiellement une preuve incriminante qui peut être utilisée contre vous dans un signalement. Vous pouvez supprimer manuellement ce serveur de NoChatReports.json dans votre dossier de configuration pour être averti à nouveau.", + "gui.nochatreports.status_unknown": "No Chat Reports n'a pas pu évaluer la sécurité de ce serveur. Cela ne devrait jamais arriver, veuillez le signaler comme un bug au développeur de ce mod.", + "gui.nochatreports.unsafe_server.header": "Attention : Serveur dangereux", + "gui.nochatreports.unsafe_server.contents": "Ce serveur exige que tous les messages soient signés, ce qui signifie qu'ils peuvent être signalés à Mojang. Le propriétaire du serveur a probablement maintenu 'enforce-secure-profile' activé dans le fichier de configuration server.properties, qui est la valeur par défaut depuis 1.19.1. Vous pouvez quand même choisir de jouer sur ce serveur, mais No Chat Reports ne pourra pas vous protéger.", + "gui.nochatreports.unsafe_server.check": "Ne plus afficher pour ce serveur", + "gui.nochatrepords.reload_config_tooltip": "Recharger la configuration de No Chat Reports. Utilisez avec précaution." } diff --git a/src/main/resources/assets/nochatreports/lang/id_id.json b/src/main/resources/assets/nochatreports/lang/id_id.json new file mode 100644 index 0000000..5ff6e3e --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/id_id.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Opsi ini tidak bekerja dengan §oNo Chat Reports§r, karena tidak ada tanda untuk diverifikasi", + "gui.nochatreport.noReporting": "Melaporkan orang lain dinonaktifkan pada server ini karena adanya §oNo Chat Reports§r", + "disconnect.nochatreports.client": "Server ini tidak memiliki §oNo Chat Reports§r, dan kamu memilih konfigurasi yang mewajibkan ada §oNo Chat Reports§r di servernya.", + "gui.nochatreports.status_secure": "Server ini memiliki §oNo Chat Reports§r atau cara lain yang membuat semua chatnya aman.", + "gui.nochatreports.status_unintrusive": "Server ini tidak memblokir laporan ke Mojang, tetapi mengizinkan untuk mengirim pesan tanpa tandanya. Jika pesan kamu dilaporkan, kemungkinan besar hanya akan diabaikan oleh Mojang.", + "gui.nochatreports.status_insecure": "Server ini mewajibkan semua orang mengirim pesan dengan tandanya, ini berarti jika pesan kamu dilaporkan dapat digunakan sebagai bukti untuk di§oban§r. Kamu dapat menghapus server ini dari §oNoChatReports.json§r untuk diperingatkan lagi tentang server ini.", + "gui.nochatreports.status_unknown": "§oNo Chat Reports§r tidak dapat mengevaluasi keamanan server ini. Ini seharusnya tidak dapat terjadi, mohon laporkan ke developer.", + "gui.nochatreports.unsafe_server.header": "Perhatian: Server Tidak Aman", + "gui.nochatreports.unsafe_server.contents": "Server ini mewajibkan semua orang mengirim pesan dengan tandanya, ini berarti laporan dapat dikirim ke Mojang. Kemungkinan besar ini berarti pemilik servernya memilih untuk menyalakan 'enforce-secure-profile' di konfigurasi servernya. Kamu masih bisa bermain tetapi §oNo Chat Reports§r tidak dapat melindungi kamu.", + "gui.nochatreports.unsafe_server.check": "Jangan perlihatkan lagi untuk server ini", + "gui.nochatrepords.reload_config_tooltip": "§oReload§r konfigurasi §oNo Chat Reports§r. Gunakan ini secara berhati-hati" +}
\ No newline at end of file diff --git a/src/main/resources/assets/nochatreports/lang/it_it.json b/src/main/resources/assets/nochatreports/lang/it_it.json new file mode 100644 index 0000000..835fd78 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/it_it.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Questa opzione non può funzionare con No Chat Reports, dal momento che non ci sono firme da verificare.", + "gui.nochatreport.noReporting": "Le segnalazioni della chat sono state disabilitate su questo server grazie a No Chat Reports.", + "disconnect.nochatreports.client": "Questo server non ha No Chat Reports e tu hai configurato No Chat Reports in modo che richieda di essere installato anche sul server.", + "gui.nochatreports.status_secure": "Questo server ha installato No Chat Reports o impedisce a tutti i messaggi di essere segnalati con qualche altro metodo noto. Nessuno vedrà una barra rossa o un simbolo (!) a lato dei messaggi, né sarà possibile nascondere i messaggi con l'opzione \"Mostra solo chat sicura\". Puoi messaggiare in sicurezza.", + "gui.nochatreports.status_unintrusive": "Questo server ti permette di inviare messaggi non firmati che non possono essere segnalati a Mojang. Tuttavia, per i client vanilla i tuoi messaggi appariranno con una barra rossa a sinistra e un simbolo (!) a destra. Inoltre, chiunque abbia l'opzione \"Mostra solo chat sicura\" attiva non potrà vedere i tuoi messaggi.", + "gui.nochatreports.status_insecure": "Questo server richiede che tutti i messaggi inviati da un giocatore siano firmati e tu hai acconsentito a continuare in queste circostanze. Qualunque cosa invierai in chat sarà una prova potenzialmente incriminante che potrà essere usata contro di te in una segnalazione. Se vuoi essere avvertito di nuovo, puoi rimuovere manualmente questo server da NoChatReports.json nella tua cartella config.", + "gui.nochatreports.status_unknown": "No Chat Reports non è stato in grado di valutare la sicurezza di questo server. Ciò non dovrebbe mai accadere: ti preghiamo di segnalarlo come un bug allo sviluppatore della mod.", + "gui.nochatreports.unsafe_server.header": "Attenzione: server non sicuro", + "gui.nochatreports.unsafe_server.contents": "Questo server richiede che tutti i messaggi della chat siano firmati, il che significa che possono essere segnalati a Mojang. Probabilmente questo significa che il proprietario del server ha lasciato 'enforce-secure-profile' attivo nel file server.properties (dalla 1.19.1 lo è per impostazione predefinita). Puoi decidere di giocarci comunque, ma No Chat Reports non sarà in grado di proteggerti.", + "gui.nochatreports.unsafe_server.check": "Non mostrare di nuovo per questo server", + "gui.nochatrepords.reload_config_tooltip": "Ricarica file di configurazione di No Chat Reports. Da usare con cautela." +} diff --git a/src/main/resources/assets/nochatreports/lang/ko_kr.json b/src/main/resources/assets/nochatreports/lang/ko_kr.json new file mode 100644 index 0000000..e94c2bd --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/ko_kr.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "확인할 서명이 없기 때문에 이 설정은 No Chat Reports와 작동하지 않습니다.", + "gui.nochatreport.noReporting": "이 서버는 No Chat Reports에 의해 신고가 비활성화되어있습니다.", + "disconnect.nochatreports.client": "이 서버는 No Chat Reports가 없으며 서버에 필요하도록 설정되어 있습니다.", + "gui.nochatreports.status_secure": "이 서버는 No Chat Reports가 설치되어 있거나 다른 알려진 방식으로 대화 메시지를 신고하는 것을 방지합니다. 아무도 빨간색 표시자나 (!) 기호를 보지 않으며 \"보안 대화만 표시\"는 메시지를 숨기지 않습니다. 안전하게 대화할 수 있습니다", + "gui.nochatreports.status_unintrusive": "이 서버는 Mojang에 신고될 수 없는 서명하지 않은 대화 메시지를 보내는 것을 허용합니다. 그러나 바닐라 클라이언트는 메시지 왼쪽에 빨간색 표시자가 표시되고 오른쪽에 (!) 기호가 표시되며 \"보안 대화만 표시\"가 켜진 경우 당신의 메시지를 볼 수 없습니다", + "gui.nochatreports.status_insecure": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 당신은 이에 동의했습니다. 당신이 보낸 모든 대화는 잠재적으로 신고에서 당신에게 불리하게 사용될 수 있는 증거가 될 수 있습니다. 다시 경고를 받으려면 config 폴더 내에 NoChatReports.json에서 이 서버를 수동으로 제거하세요.", + "gui.nochatreports.status_unknown": "No Chat Reports는 이 서버의 안전성을 평가할 수 없습니다. 이것은 발생해서는 안됩니다. 모드 개발자에게 버그로 보고해주세요.", + "gui.nochatreports.unsafe_server.header": "주의: 안전하지 않은 서버", + "gui.nochatreports.unsafe_server.contents": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 이는 대화 메시지가 Mojang에 신고될 수 있다는 것을 의미합니다. 서버 소유자가 1.19.1 이후 기본값인 server.properties 내의 'enforce-secure-profile'을 켰을 수 있습니다. 이를 무시하고 플레이할 수 있지만 No Chat Reports는 당신을 보호할 수 없습니다.", + "gui.nochatreports.unsafe_server.check": "이 서버에 대해 이 화면을 다시 보지 않기", + "gui.nochatrepords.reload_config_tooltip": "No Chat Reports 설정을 새로고침합니다. 주의해서 사용하세요." +} diff --git a/src/main/resources/assets/nochatreports/lang/nl_nl.json b/src/main/resources/assets/nochatreports/lang/nl_nl.json new file mode 100644 index 0000000..63b9755 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/nl_nl.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Deze optie kan niet samenwerken met No Chat Reports, omdat er geen digitale handtekingen zijn om te verifiëren.", + "gui.nochatreport.noReporting": "Chat rapporten zijn uitgeschakeld op deze server, met dank aan No Chat Reports.", + "disconnect.nochatreports.client": "Deze server heeft geen ondersteuning voor No Chat Reports, en je hebt de mod geconfigureerd om zichzelf te vereisen op de server.", + "gui.nochatreports.status_secure": "Deze server heeft No Chat Reports geïnstalleerd, of voorkomt het rapporteren van berichten op een andere bekende manier. Je kan de chat veilig gebruiken.", + "gui.nochatreports.status_unintrusive": "Deze server voorkomt niet dat chatberichten gerapporteerd worden, maar staat het versturen van berichten zonder digitale handtekening toe. Technisch gezien kunnen ze gerapporteerd worden aan Mojang, maar worden over het algemeen niet beschouwd als geldig bewijs. Het is onwaarschijnlijk dat er actie ondernomen wordt op deze rapporten.", + "gui.nochatreports.status_insecure": "Deze server vereist dat alle berichten van spelers digitaal ondertekend worden, en je bent met deze regeling akkoord gegaan. Elk bericht dat je in deze chat verstuurd is mogelijk belastend bewijs dat tegen je gebruikt kan worden in het rapport. Je kan deze server handmatig verwijderen uit je NoChatReports.json in je config folder om opnieuw gewaarschuwd te worden.", + "gui.nochatreports.status_unknown": "No Chat Reports kon de veiligheid van deze server niet evalueren. Dit zou nooit mogen gebeuren, rapporteer dit alsjeblieft als een bug aan de mod ontwikkelaar.", + "gui.nochatreports.unsafe_server.header": "Opgelet: Onveilige Server", + "gui.nochatreports.unsafe_server.contents": "Deze server vereist dat alle berichten van spelers digitaal ondertekend worden, wat betekent dat ze aan Mojang gerapporteerd kunnen worden. Waarschijnlijk komt dit omdat de eigenaar van de server de 'enforce-secure-profile' optie ingeschakeld gehouden heeft in de server.properties, wat sinds 1.19.1 de standaard is. Je kan ervoor kiezen om toch op deze server te spelen, echter zal No Chat Reports niet in staat zijn om je te beschermen.", + "gui.nochatreports.unsafe_server.check": "Niet meer tonen voor deze server", + "gui.nochatrepords.reload_config_tooltip": "Herlaad de No Chat Reports configuratie. Gebruik zorgvuldig." +} diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json index 654471f..42dd7f3 100644 --- a/src/main/resources/assets/nochatreports/lang/pl_pl.json +++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json @@ -2,4 +2,12 @@ "gui.nochatreport.secureChat": "Ta opcja nie działa z No Chat Reports, ponieważ nie ma podpisów do weryfikacji.", "gui.nochatreport.noReporting": "Raporty czatu są wyłączone na tym serwerze, dzięki No Chat Reports.", "disconnect.nochatreports.client": "Na tym serwerze nie ma No Chat Reports, a został skonfigurowany tak, aby był wymagany na serwerze." + "gui.nochatreports.status_secure": "Ten serwer ma zainstalowane No Chat Reports lub uniemożliwia raportowanie wiadomości w inny znany sposób. Nikt nie będzie widzieć czerwonego paska czy symbolu (!) lub może wyłączyć wiadomości przez opcję \"Tylko bezpieczny czat\". Możesz bezpiecznie chatować.", + "gui.nochatreports.status_unintrusive": "Ten serwer pozwala na wysyłanie nie podpisanych wiadomości, których nie można zgłosić do Mojangu. Jednakże u klientów Vanilla wiadomości będą mieć czerwony pasek po lewej i symbol (!) po prawej, a włączenie opcji \"Tylko bezpieczny czat\" przez kogokolwiek nie pokaże im twoich wiadomości w ogóle.", + "gui.nochatreports.status_insecure": "Ten serwer wymaga podpisania wszystkich wiadomości graczy, a ty zgodziłeś się kontynuować z tym. Wszystko, co wysyłasz na czacie, jest potencjalnie obciążającym dowodem, który można wykorzystać przeciwko tobie w zgłoszeniu. Możesz ręcznie usunąć ten serwer z NoChatReports.json w folderze konfiguracyjnym, aby ponownie otrzymać ostrzeżenie.", + "gui.nochatreports.status_unknown": "No Chat Reports nie może ocenić bezpieczeństwa tego serwera. To nigdy nie powinno się zdarzyć, zgłoś to jako błąd twórcy modów.", + "gui.nochatreports.unsafe_server.header": "Uwaga: Niezabezpieczony serwer", + "gui.nochatreports.unsafe_server.contents": "Ten serwer wymaga podpisania wszystkich wiadomości czatu, co oznacza, że można je zgłaszać do Mojang. Prawdopodobnie oznacza to, że właściciel serwera pozostawił włączony „enforce-secure-profile” w server.properties, co jest ustawieniem domyślnym od 1.19.1. Pomimo to możesz dalej zagrać, ale No Chat Reports nie będzie w stanie Cię ochronić.", + "gui.nochatreports.unsafe_server.check": "Nie pokazuj ponownie dla tego serwera", + "gui.nochatrepords.reload_config_tooltip": "Przeładuj konfigurację No Chat Reports. Używaj ostrożnie." } diff --git a/src/main/resources/assets/nochatreports/lang/ro_ro.json b/src/main/resources/assets/nochatreports/lang/ro_ro.json new file mode 100644 index 0000000..ced3792 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/ro_ro.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Această opțiune nu poate funcționa cu No Chat Reports, deoarece nu există semnături de verificat.", + "gui.nochatreport.noReporting": "Rapoartele de chat sunt dezactivate pe acest server, folosind No Chat Reports.", + "disconnect.nochatreports.client": "Acest server nu are No Chat Reports, iar tu îl ai configurat să fie necesar pe server.", + "gui.nochatreports.status_secure": "Acest server are No Chat Reports instalat sau previne mesajele tuturor de la a fi raportate în alt mod. Nimeni nu va vedea o bară roșie, simbol (!) sau să poată ascunde mesajele cu „Only Show Secure Chat”. Poți să trimiți mesaje în siguranță.", + "gui.nochatreports.status_unintrusive": "Acest server îți permite să trimiți mesaje nesemnate, care nu pot fi raportate la Micro$oft. Cu toate acestea, pentru clienți vanilla mesajele vor avea o bară roșie în stânga, un simbol (!) în dreapta și orcine activează „Only Show Secure Chat” nu-ți va vedea mesajele deloc.", + "gui.nochatreports.status_insecure": "Acest server cere ca toate mesajele să fie semnate, și ai fost de acord cu asta. Orice trimiți poate fi folosit împotriva ta. Poți să ștergi acest server din NoChatReports.json în folderul tău de config pentru a fi atenționat iar.", + "gui.nochatreports.status_unknown": "No Chat Reports nu a putut evalua siguranța acestui server. Aceasta nu ar trebui să se întâmple niciodată, te rog trimite-l ca un bug la dezvoltatorul modului..", + "gui.nochatreports.unsafe_server.header": "Atenție: server nesigur", + "gui.nochatreports.unsafe_server.contents": "Acest server cere ca toate mesajele să fie semnate, ceea ce înseamnă că pot fi raportate la Micro$oft. Aceasta probabil înseamnă că proprietarul serverului a lăsat „enforce-secure-profile” activat pe server.properties, care este implicit din 1.19.1. Poți alege să joci, dar No Chat Reports nu va putea să te protejeze.", + "gui.nochatreports.unsafe_server.check": "Nu afișa din nou pentru acest server", + "gui.nochatrepords.reload_config_tooltip": "Reîncarcă configurația No Chat Reports. Folosește cu grijă." +} diff --git a/src/main/resources/assets/nochatreports/lang/ru_ru.json b/src/main/resources/assets/nochatreports/lang/ru_ru.json index a0464bd..802ca85 100644 --- a/src/main/resources/assets/nochatreports/lang/ru_ru.json +++ b/src/main/resources/assets/nochatreports/lang/ru_ru.json @@ -1,5 +1,13 @@ {
"gui.nochatreport.secureChat": "Этот параметр не работает с No Chat Reports ввиду отсутствия криптографических сигнатур.",
"gui.nochatreport.noReporting": "Жалобы на чат отключены на этом сервере благодаря No Chat Reports.",
- "disconnect.nochatreports.client": "У вас отсутствует модификация No Chat Reports (обязательная на сервере)."
+ "disconnect.nochatreports.client": "Текущая конфигурация требует наличия No Chat Reports везде, но на данном сервере мод отсутствует.",
+ "gui.nochatreports.status_secure": "На этом сервере либо установлена модификация No Chat Reports, либо он он предотвращает возможность отправки жалоб с прикреплением сообщений. Вы можете общаться безопасно.",
+ "gui.nochatreports.status_unintrusive": "Сервер не запрещает жалобы, но позволяет вам отправлять неподписанные сообщения. Технически, они всё ещё могут быть отправлены Mojang, но их нельзя использовать как подлинное доказательство, и поэтому к ним вряд ли могут быть применены какие-либо действия.",
+ "gui.nochatreports.status_insecure": "Сервер требует, чтобы все сообщения игроков были подписаны, и вы согласились с этим условием. Всё, что вы отправляете в чат, является потенциальной уликой, и это может быть использовано против вас в жалобе. Вы можете вручную удалить этот сервер из NoChatReports.json в файле конфигурации чтобы снова получить это предупреждение.",
+ "gui.nochatreports.status_unknown": "No Chat Reports не смог оценить безопасность сервера. Такого не должно случаться, это баг. Пожалуйста, сообщите разработчику мода об этой ситуации.",
+ "gui.nochatreports.unsafe_server.header": "Внимание: Небезопасный сервер",
+ "gui.nochatreports.unsafe_server.contents": "Сервер требует, чтобы все сообщения игроков были подписаны, поэтому они могут быть отправлены Mojang. Скорее всего, владелец сервера оставил опцию 'enforce-secure-profile' включённой в server.properties, что является значением по-умолчанию с 1.19.1. Вы можете проигнорировать это предупреждение, но тогда No Chat Reports не сможет защитить вас.",
+ "gui.nochatreports.unsafe_server.check": "Никогда не показывать для этого сервера",
+ "gui.nochatrepords.reload_config_tooltip": "Перезагрузить конфигурацию No Chat Reports. Использовать с осторожностью."
}
diff --git a/src/main/resources/assets/nochatreports/lang/tr_tr.json b/src/main/resources/assets/nochatreports/lang/tr_tr.json new file mode 100644 index 0000000..2400d2a --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/tr_tr.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Bu seçenek doğrulanacak imza olmadığından No Chat Reports ile çalışamaz.", + "gui.nochatreport.noReporting": "No Chat Reports sayesinde bu sunucuda sohbet bildirileri devre dışı bırakıldı.", + "disconnect.nochatreports.client": "Bu sunucuda No Chat Reports yok ve siz kendisini bu sunucuda gerektirecek şekilde ayarladınız.", + "gui.nochatreports.status_secure": "Bu sunucuda No Chat Reports yüklü ya da herkesin mesajlarının bilinen başka bir şekilde bildirilebilmesini engelliyor. Kimse kırmızı çubuk, (!) sembolü göremeyecek ya da \"Sadece Güvenli Sohbeti Göster\" ile mesajları gizleyemeyecek. Güvenli bir şekilde sohbet edebilirsiniz.", + "gui.nochatreports.status_unintrusive": "Bu sunucu, Mojang'a bildirilemeyen imzasız mesaj göndermenize izin veriyor. Ancak, vanilya istemcileri için mesajlar solda kırmızı bir çubuk, sağda (!) sembolü gösterecek ve \"Sadece Güvenli Sohbeti Göster\" seçeneğini etkinleştiren hiç kimse mesajlarınızı göremez.", + "gui.nochatreports.status_insecure": "Bu sunucu tüm oyuncu mesajlarının imzalanmasını talep ediyor ve siz de bu düzenlemeye uymayı kabul ettiniz. Sohbette gönderdiğiniz her şey, raporda aleyhinize kullanılabilecek potansiyel olarak suçlayıcı kanıtlardır. Yeniden uyarılmak için bu sunucuyu yapılandırma klasöründeki NoChatReports.json'dan manuel olarak kaldırabilirsiniz.", + "gui.nochatreports.status_unknown": "No Chat Reports bu sunucunun güvenliğini değerlendiremedi. Bu asla olmamalıydı, lütfen mod geliştiricisine bu hatayı bildirin.", + "gui.nochatreports.unsafe_server.header": "Dikkat: Güvensiz Sunucu", + "gui.nochatreports.unsafe_server.contents": "Bu sunucu, tüm sohbet mesajlarının imzalanmasını gerektiriyor; bu, Mojang'a bildirilecekleri anlamına gelir. Bu muhtemelen sunucu sahibinin 1.19.1'den beri varsayılan olan server.properties'teki 'enforce-secure-profile' özelliğini etkin tuttuğu anlamına gelir. Yine de oynamayı deneyebilirsiniz, ancak No Chat Reports sizi koruyamaz.", + "gui.nochatreports.unsafe_server.check": "Bu sunucu için asla gösterme", + "gui.nochatrepords.reload_config_tooltip": "No Chat Reports'un yapılandırma klasörünü yenile. Dikkatli kullanın." +} diff --git a/src/main/resources/assets/nochatreports/lang/uk_ua.json b/src/main/resources/assets/nochatreports/lang/uk_ua.json new file mode 100644 index 0000000..4dbe744 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/uk_ua.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Ця опція не сумісна із модом No Chat Reports, бо підписів для перевірки не буде.", + "gui.nochatreport.noReporting": "Завдяки No Chat Reports, на цьому сервері неможливо скаржитися на повідомлення в чаті.", + "disconnect.nochatreports.client": "Цей сервер не може забезпечети можливість вільної комунікації у чаті. Ваші налаштування не дозволяють приєднуватися до таких серверів, запропонуйте адміністратору встановити No Chat Reports.", + "gui.nochatreports.status_secure": "Цей сервер є безпечним: на ньому встановлено мод No Chat Reports або використувуються відомі методи для унеможливлювання скарг на повідомлення. Спілкуйтесь на здоров'я!", + "gui.nochatreports.status_unintrusive": "Цей сервер не забороняє гравцям скаржитися на повідомлення в чаті, але одночасно відмова від підпису повідомлень дозволена. Теоретично на вас ще можуть поскаржитися до Mojang, але довести вашу провину буде надто складно, що робить вірогідність блокування або інших санкцій дуже, дуже малою.", + "gui.nochatreports.status_insecure": "Цей сервер вимогає від усіх гравців підписувати повідомлення у чаті. Ваші налаштування не забороняють приєднуватись до цього серверу, але на кожне з ваших повідомлень зможуть поскаржитись. Будь-що сказане вами може бути використано як беззаперечні докази порушення правил Mojang. Ви можете видалити цей сервер із файлу NoChatReports.json, щоб повернути попередження.", + "gui.nochatreports.status_unknown": "No Chat Reports не вдалося зробити висновок про безпечність цього серверу. Ця поведінка не нормальна та є ознакою помилки, будь ласка, повідомте автора модифікації про це.", + "gui.nochatreports.unsafe_server.header": "Увага: небезпечний сервер", + "gui.nochatreports.unsafe_server.contents": "Цей сервер вимогає від вас підписувати усі повідомлення, які ви надсилаєте у чат. Це значить, що на них можна буде поскаржитись у Mojang. Скоріш за все, адміністратор серверу не вимкнув опцію 'enforce-secure-profile' у своєму server.properties (ця опція є увімкненою за умовчанням у версіях 1.19.1+). Ви можете під'єднатись все одно, але No Chat Reports не буде працювати тут. Вас попередили.", + "gui.nochatreports.unsafe_server.check": "Не показувати знов (тільки для цього серверу)", + "gui.nochatrepords.reload_config_tooltip": "Перезавантажити конфігурацію No Chat Reports. Використовуйте обачливо." +} diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index ce0c058..c986469 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -1,5 +1,13 @@ { - "gui.nochatreport.secureChat": "此选项无法与No Chat Reports一起使用,因为没有可用于验证的签名。", - "gui.nochatreport.noReporting": "聊天举报在此服务器上被禁用,由No Chat Reports提供。", - "disconnect.nochatreports.client": "此服务器没有No Chat Reports,但你已将其配置为要求在服务器上安装。" -}
\ No newline at end of file + "gui.nochatreport.secureChat": "此选项无法与 No Chat Reports 一起使用,因为没有可用于验证的签名。", + "gui.nochatreport.noReporting": "聊天举报在此服务器上被禁用,由 No Chat Reports 提供。", + "disconnect.nochatreports.client": "此服务器没有安装 No Chat Reports,但你已将其配置为要求在服务器上安装。", + "gui.nochatreports.status_secure": "此服务器安装了 No Chat Reports 或其他已知的方法避免消息被举报。这也会避免 \"仅显示安全的聊天\" 挡你的消息。你可以安全地聊天。", + "gui.nochatreports.status_unintrusive": "此服务器不能防止聊天举报,但允许发送未签名的消息。这意味着你发的消息不能被举报给 Mojang,但其他人还可以用 \"仅显示安全的聊天\" 挡你的消息", + "gui.nochatreports.status_insecure": "此服务器要求所有玩家的消息签名,你也同意在这设置下继续游戏。你所发送的任何消息都可能成为你被举报时潜在的违规证据。你可以在 NoChatReports.json 中手动移除此服务器,以再次获得相同的警告。", + "gui.nochatreports.status_unknown": "No Chat Reports 无法检测此服务器的安全性。这不应该发生,请将此错误反馈给模组作者。", + "gui.nochatreports.unsafe_server.header": "警告:不安全的服务器", + "gui.nochatreports.unsafe_server.contents": "此服务器要求所有消息签名,这意味着它们可以被举报给 Mojang。可能是服务器默认开启了 'enforce-secure-profile' 选项。你可以选择继续游玩,但 No Chat Reports 不能提供任何保护。", + "gui.nochatreports.unsafe_server.check": "不在此服务器中再次显示", + "gui.nochatrepords.reload_config_tooltip": "重载 No Chat Reports 配置。请小心使用。" +} diff --git a/src/main/resources/assets/nochatreports/lang/zh_tw.json b/src/main/resources/assets/nochatreports/lang/zh_tw.json new file mode 100644 index 0000000..52a79e1 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "此選項無法與 No Chat Reports 一起使用,因為沒有可用於驗證的簽名。", + "gui.nochatreport.noReporting": "聊天舉報在此伺服器上被禁用,由 No Chat Reports 提供。", + "disconnect.nochatreports.client": "此伺服器沒有安裝 No Chat Reports,但你已將其配置為要求在伺服器上安裝。", + "gui.nochatreports.status_secure": "此伺服器安裝了 No Chat Reports 或其他已知的方法避免消息被舉報。這也會避免「僅顯示已受保護的聊天內容」阻擋你的消息。你可以安全地聊天。", + "gui.nochatreports.status_unintrusive": "此伺服器不能防止聊天舉報,但允許發送未簽名的消息。這意味著你發的消息不能被舉報給 Mojang,但其他人還可以用「僅顯示已受保護的聊天內容」阻擋你的消息", + "gui.nochatreports.status_insecure": "此伺服器要求所有玩家的消息簽名,你也同意在這設置下繼續遊戲。你所發送的任何消息都可能成為你被舉報時潛在的違規證據。你可以在「NoChatReports.json」中手動移除此伺服器,以再次獲得相同的警告。", + "gui.nochatreports.status_unknown": "No Chat Reports 無法檢測此伺服器的安全性。這不應該發生,請將此錯誤反饋給模組作者。", + "gui.nochatreports.unsafe_server.header": "警告:不安全的伺服器", + "gui.nochatreports.unsafe_server.contents": "此伺服器要求所有消息簽名,這意味著它們可以被舉報給 Mojang。可能是伺服器默認開啟了「enforce-secure-profile」選項。你可以選擇繼續遊玩,但 No Chat Reports 不能提供任何保護。", + "gui.nochatreports.unsafe_server.check": "不在此伺服器中再次顯示", + "gui.nochatrepords.reload_config_tooltip": "重載 No Chat Reports 配置。請小心使用。" +} 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..a91f7d2 --- /dev/null +++ b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png diff --git a/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png b/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png Binary files differnew file mode 100644 index 0000000..efe48d1 --- /dev/null +++ b/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index 24829a5..6f3e42a 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -6,21 +6,33 @@ "refmap": "nochatreports.refmap.json", "verbose": true, "mixins": [ - "MixinPlayer", - "MixinServerboundChatPacket", - "MixinServerGamePacketListenerImpl" + "server.MixinPlayer", + "server.MixinServerboundChatPacket", + "server.MixinServerGamePacketListenerImpl", + "server.MixinServerStatus", + "server.MixinPlayerList" ], "client": [ - "MixinLocalPlayer", - "MixinClientPacketListener", - "MixinOptions", - "MixinProfileKeyPairManager", - "MixinClientTelemetryManager", - "MixinMinecraft", - "MixinBrandingControl" + "client.MixinLocalPlayer", + "client.MixinOptions", + "client.MixinChatListener", + "client.MixinChatOptionsScreen", + "client.MixinProfileKeyPairManager", + "client.MixinClientTelemetryManager", + "client.MixinBrandingControl", + "client.MixinMinecraft", + "client.MixinPlayerEntry", + "client.MixinChatScreen", + "client.AccessorDisconnectedScreen", + "client.MixinConnectScreen", + "client.MixinClientboundHelloPacket", + "client.MixinJoinMultiplayerScreen", + "client.MixinGuiMessageTag", + "client.MixinToastComponent", + "client.MixinRealmsConnect" ], "server": [ - "MixinDedicatedServer" + "server.MixinDedicatedServer" ], "injectors": { "defaultRequire": 1 |
