diff options
| author | Aizistral | 2022-07-31 01:43:33 +0200 |
|---|---|---|
| committer | Aizistral | 2022-07-31 01:43:33 +0200 |
| commit | 64e8522f0f6fd325c5f615e024b0414c056c0853 (patch) | |
| tree | 6dd9dfcc44b61da4ca20f2d8ee65d9e75d2346c9 /src/main/java | |
| parent | c15f0d2fa4c76b8cdff8941c7b62537c82ed243e (diff) | |
Make it build again
Diffstat (limited to 'src/main/java')
37 files changed, 1658 insertions, 347 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); + } + +} |
