From e6acfdbed63685627cc169742cbd684becfddb15 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 11 Jul 2022 22:52:10 +0200 Subject: Sort mixins by client/server --- .../nochatreports/NoChatReportsClient.java | 2 +- .../mixins/AccessorDisconnectedScreen.java | 15 --- .../nochatreports/mixins/MixinChatListener.java | 45 ------- .../nochatreports/mixins/MixinChatScreen.java | 147 --------------------- .../mixins/MixinClientTelemetryManager.java | 27 ---- .../mixins/MixinClientboundHelloPacket.java | 22 --- .../nochatreports/mixins/MixinConnectScreen.java | 36 ----- .../nochatreports/mixins/MixinDedicatedServer.java | 24 ---- .../mixins/MixinJoinMultiplayerScreen.java | 131 ------------------ .../nochatreports/mixins/MixinLocalPlayer.java | 56 -------- .../nochatreports/mixins/MixinMinecraft.java | 31 ----- .../nochatreports/mixins/MixinOptions.java | 36 ----- .../nochatreports/mixins/MixinPlayer.java | 27 ---- .../nochatreports/mixins/MixinPlayerEntry.java | 77 ----------- .../mixins/MixinProfileKeyPairManager.java | 60 --------- .../mixins/MixinServerGamePacketListenerImpl.java | 48 ------- .../mixins/MixinServerboundChatPacket.java | 31 ----- .../nochatreports/mixins/MixinTitleScreen.java | 22 --- .../mixins/client/AccessorDisconnectedScreen.java | 15 +++ .../mixins/client/MixinChatListener.java | 45 +++++++ .../mixins/client/MixinChatScreen.java | 147 +++++++++++++++++++++ .../mixins/client/MixinClientTelemetryManager.java | 27 ++++ .../mixins/client/MixinClientboundHelloPacket.java | 22 +++ .../mixins/client/MixinConnectScreen.java | 36 +++++ .../mixins/client/MixinJoinMultiplayerScreen.java | 131 ++++++++++++++++++ .../mixins/client/MixinLocalPlayer.java | 56 ++++++++ .../mixins/client/MixinMinecraft.java | 31 +++++ .../nochatreports/mixins/client/MixinOptions.java | 36 +++++ .../mixins/client/MixinPlayerEntry.java | 77 +++++++++++ .../mixins/client/MixinProfileKeyPairManager.java | 60 +++++++++ .../mixins/client/MixinTitleScreen.java | 22 +++ .../mixins/server/MixinDedicatedServer.java | 24 ++++ .../nochatreports/mixins/server/MixinPlayer.java | 27 ++++ .../server/MixinServerGamePacketListenerImpl.java | 48 +++++++ .../mixins/server/MixinServerboundChatPacket.java | 31 +++++ src/main/resources/nochatreports.mixins.json | 34 ++--- 36 files changed, 853 insertions(+), 853 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index ccd931d..7e3b852 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -6,7 +6,7 @@ import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.gui.UnsafeServerScreen; -import com.aizistral.nochatreports.mixins.AccessorDisconnectedScreen; +import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen; import com.aizistral.nochatreports.network.ClientChannelHandler; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java deleted file mode 100644 index 06d2207..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import net.minecraft.client.gui.screens.DisconnectedScreen; -import net.minecraft.network.chat.Component; - -@Mixin(DisconnectedScreen.class) -public interface AccessorDisconnectedScreen { - - @Accessor - public Component getReason(); - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java deleted file mode 100644 index 5d90beb..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import java.util.Base64; - -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 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.ChatSender; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.PlayerChatMessage; - -@Mixin(ChatListener.class) -public class MixinChatListener { - - /** - * @reason No annoying safety notices, thanks. Your system is unsafe anyways. - * @author Aizistral - */ - - @Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true) - private void onEvaluateTrustLevel(ChatSender chatSender, PlayerChatMessage playerChatMessage, - Component component, PlayerInfo playerInfo, CallbackInfoReturnable info) { - if (NoReportsConfig.suppressMessageTrustIndicators()) { - info.setReturnValue(ChatTrustLevel.SECURE); - } - - // Debug never dies - if (NoReportsConfig.isDebugLogEnabled()) { - NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", - Component.Serializer.toStableJson(playerChatMessage.signedContent()), - chatSender.name().getString(), - Base64.getEncoder().encodeToString(playerChatMessage.signature().saltSignature().signature())); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java deleted file mode 100644 index da7f390..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import java.util.List; -import java.util.stream.Collectors; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.aizistral.nochatreports.core.NoReportsConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.BufferUploader; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; - -import net.minecraft.client.OptionInstance; -import net.minecraft.client.OptionInstance.TooltipSupplierFactory; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.ImageButton; -import net.minecraft.client.gui.screens.ChatScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; - -@Mixin(ChatScreen.class) -public abstract class MixinChatScreen extends Screen { - private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png"); - - protected MixinChatScreen() { - 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; - } - - private int getXOffset(ServerSafetyLevel level) { - return switch (level) { - case SECURE -> 21; - case UNINTRUSIVE, UNKNOWN -> 42; - case INSECURE -> 0; - }; - } - - protected void renderTooltipNoGap(PoseStack poseStack, List list, int i, int j) { - this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); - } - - protected void renderTooltipInternalNoGap(PoseStack poseStack, List 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/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java deleted file mode 100644 index 9868eaf..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 = "", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;" - + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;", - remap = false)) - private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) { - return TelemetrySession.DISABLED; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java deleted file mode 100644 index b14c9bc..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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.ServerSafetyState; - -import net.minecraft.network.protocol.login.ClientLoginPacketListener; -import net.minecraft.network.protocol.login.ClientboundHelloPacket; - -@Mixin(ClientboundHelloPacket.class) -public class MixinClientboundHelloPacket { - - @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/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java deleted file mode 100644 index 92922b4..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.aizistral.nochatreports.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 { - - @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/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java deleted file mode 100644 index 04748e3..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("RETURN"), cancellable = true) - private void onEnforceSecureProfile(CallbackInfoReturnable cir) { - cir.setReturnValue(false); - } - -} \ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java deleted file mode 100644 index 36993a2..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import java.util.List; -import java.util.stream.Collectors; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.aizistral.nochatreports.core.NoReportsConfig; -import com.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; - -@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) { - 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 list, int i, int j) { - this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); - } - - protected void renderTooltipInternalNoGap(PoseStack poseStack, List 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/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java deleted file mode 100644 index c9f129a..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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.Component; -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 (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) - private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable info) { - if (!ServerSafetyState.forceSignedMessages()) { - info.setReturnValue(MessageSignature.unsigned(signer.sender())); - } - } - - /** - * @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 onSignCommand(MessageSigner signer, ParseResults results, @Nullable Component component, CallbackInfoReturnable 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/MixinMinecraft.java deleted file mode 100644 index e1d986b..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import java.time.Instant; -import java.util.UUID; - -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 com.aizistral.nochatreports.core.NoReportsConfig; -import com.mojang.authlib.minecraft.BanDetails; -import com.mojang.authlib.minecraft.UserApiService; - -import net.fabricmc.fabric.mixin.client.rendering.MixinInGameHud; -import net.minecraft.client.Minecraft; -import net.minecraft.client.Minecraft.ChatStatus; -import net.minecraft.world.entity.player.ChatVisiblity; - -@Mixin(Minecraft.class) -public class MixinMinecraft { - - @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0) - private void onCreateTitle(CallbackInfoReturnable info) { - if (info.getReturnValue().contains("1.19.1")) { - info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84")); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java deleted file mode 100644 index 1bb2bd4..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import com.google.common.collect.ImmutableList; -import com.mojang.serialization.Codec; -import net.minecraft.client.OptionInstance; -import net.minecraft.client.Options; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Options.class) -public class MixinOptions { - private OptionInstance alternativeOption; - - /** - * @reason Disable secure chat option, since it will not work anyways. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "onlyShowSecureChat", at = @At("RETURN"), cancellable = true) - private void onlyShowSecureChat(CallbackInfoReturnable> 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) -> {}); - } - - cir.setReturnValue(this.alternativeOption); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java deleted file mode 100644 index 0048ade..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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) -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) - */ - - @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true) - private void onGetProfileKey(CallbackInfoReturnable info) { - info.setReturnValue(null); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java deleted file mode 100644 index b084732..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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 list, int i, int j) { - throw new IllegalStateException("@Shadow transformation failed. Should never happen."); - } - - /** - * @reason Disable chat report button if we are on client. - * @author Aizistral - */ - - @Inject(method = "", at = @At("RETURN")) - private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier supplier, 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 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/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java deleted file mode 100644 index 73734e9..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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 We don't have to send our keys anywhere, and thus we won't. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true) - private void onProfilePublicKey(CallbackInfoReturnable> info) { - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); - } - } - - /** - * @reason We don't have to send our keys anywhere, and thus we won't. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) - private void onProfilePublicKeyData(CallbackInfoReturnable> info) { - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); - } - } - - /** - * @reason Prevent client from trying to produce signature in - * {@link ClientHandshakePacketListenerImpl#handleHello}. - * @author Aizistral (Overwrite) - * @author Aven (Inject) - */ - - @Inject(method = "signer", at = @At("HEAD"), cancellable = true) - private void onSigner(CallbackInfoReturnable> info) { - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(null); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java deleted file mode 100644 index 297982b..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import com.aizistral.nochatreports.core.NoReportsConfig; - -import net.minecraft.core.Registry; -import net.minecraft.network.chat.ChatTypeDecoration; -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.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.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", at = @At("HEAD"), cancellable = true) - private void onSend(Packet packet, CallbackInfo info) { - if (NoReportsConfig.convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { - Component component = chat.unsignedContent().orElse(chat.signedContent()); - ChatTypeDecoration decoration = player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.typeId()).chat(); - component = decoration.decorate(component, chat.sender()); - packet = new ClientboundSystemChatPacket(component, false); - - info.cancel(); - this.send(packet); - } - } - } - -} 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 cb8f8ad..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -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 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("RETURN"), cancellable = true) - private void onGetSignature(UUID id, CallbackInfoReturnable info) { - info.setReturnValue(new MessageSignature(Util.NIL_UUID, info.getReturnValue().timeStamp(), SaltSignaturePair.EMPTY)); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java deleted file mode 100644 index e514d83..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.aizistral.nochatreports.mixins; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import com.mojang.bridge.game.GameVersion; - -import net.minecraft.WorldVersion; -import net.minecraft.client.gui.screens.TitleScreen; - -@Mixin(TitleScreen.class) -public class MixinTitleScreen { - - @Redirect(method = "render", at = @At(value = "INVOKE", remap = true, target = - "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0) - private String onGetVersionName(WorldVersion version) { - String original = version.getName(); - return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original; - } - -} 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..1cf76f5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java @@ -0,0 +1,15 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.network.chat.Component; + +@Mixin(DisconnectedScreen.class) +public interface AccessorDisconnectedScreen { + + @Accessor + public Component getReason(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java new file mode 100644 index 0000000..ae46f06 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -0,0 +1,45 @@ +package com.aizistral.nochatreports.mixins.client; + +import java.util.Base64; + +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 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.ChatSender; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.PlayerChatMessage; + +@Mixin(ChatListener.class) +public class MixinChatListener { + + /** + * @reason No annoying safety notices, thanks. Your system is unsafe anyways. + * @author Aizistral + */ + + @Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true) + private void onEvaluateTrustLevel(ChatSender chatSender, PlayerChatMessage playerChatMessage, + Component component, PlayerInfo playerInfo, CallbackInfoReturnable info) { + if (NoReportsConfig.suppressMessageTrustIndicators()) { + info.setReturnValue(ChatTrustLevel.SECURE); + } + + // Debug never dies + if (NoReportsConfig.isDebugLogEnabled()) { + NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", + Component.Serializer.toStableJson(playerChatMessage.signedContent()), + chatSender.name().getString(), + Base64.getEncoder().encodeToString(playerChatMessage.signature().saltSignature().signature())); + } + } + +} 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..234a737 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -0,0 +1,147 @@ +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; + +@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; + } + + private int getXOffset(ServerSafetyLevel level) { + return switch (level) { + case SECURE -> 21; + case UNINTRUSIVE, UNKNOWN -> 42; + case INSECURE -> 0; + }; + } + + protected void renderTooltipNoGap(PoseStack poseStack, List list, int i, int j) { + this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); + } + + protected void renderTooltipInternalNoGap(PoseStack poseStack, List 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..36e1986 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java @@ -0,0 +1,27 @@ +package com.aizistral.nochatreports.mixins.client; + +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 = "", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;" + + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;", + remap = false)) + private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) { + return TelemetrySession.DISABLED; + } + +} 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..81ed384 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java @@ -0,0 +1,22 @@ +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.ServerSafetyState; + +import net.minecraft.network.protocol.login.ClientLoginPacketListener; +import net.minecraft.network.protocol.login.ClientboundHelloPacket; + +@Mixin(ClientboundHelloPacket.class) +public class MixinClientboundHelloPacket { + + @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..a086b28 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -0,0 +1,36 @@ +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 { + + @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/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java new file mode 100644 index 0000000..0e7584c --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -0,0 +1,131 @@ +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; + +@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) { + 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 list, int i, int j) { + this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); + } + + protected void renderTooltipInternalNoGap(PoseStack poseStack, List 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..31319e1 --- /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.Component; +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 (Overwrite) + * @author Aven (Inject) + */ + + @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) + private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable info) { + if (!ServerSafetyState.forceSignedMessages()) { + info.setReturnValue(MessageSignature.unsigned(signer.sender())); + } + } + + /** + * @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 onSignCommand(MessageSigner signer, ParseResults results, @Nullable Component component, CallbackInfoReturnable info) { + if (!ServerSafetyState.forceSignedMessages()) { + info.setReturnValue(ArgumentSignatures.empty()); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java new file mode 100644 index 0000000..a9f8929 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java @@ -0,0 +1,31 @@ +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; +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.fabricmc.fabric.mixin.client.rendering.MixinInGameHud; +import net.minecraft.client.Minecraft; +import net.minecraft.client.Minecraft.ChatStatus; +import net.minecraft.world.entity.player.ChatVisiblity; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0) + private void onCreateTitle(CallbackInfoReturnable info) { + if (info.getReturnValue().contains("1.19.1")) { + info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84")); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java new file mode 100644 index 0000000..934a503 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.google.common.collect.ImmutableList; +import com.mojang.serialization.Codec; +import net.minecraft.client.OptionInstance; +import net.minecraft.client.Options; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Options.class) +public class MixinOptions { + private OptionInstance alternativeOption; + + /** + * @reason Disable secure chat option, since it will not work anyways. + * @author Aizistral (Overwrite) + * @author Aven (Inject) + */ + + @Inject(method = "onlyShowSecureChat", at = @At("RETURN"), cancellable = true) + private void onlyShowSecureChat(CallbackInfoReturnable> 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) -> {}); + } + + cir.setReturnValue(this.alternativeOption); + } + +} 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..3cf92d8 --- /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 list, int i, int j) { + throw new IllegalStateException("@Shadow transformation failed. Should never happen."); + } + + /** + * @reason Disable chat report button if we are on client. + * @author Aizistral + */ + + @Inject(method = "", at = @At("RETURN")) + private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier supplier, 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 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..a02a952 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java @@ -0,0 +1,60 @@ +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 We don't have to send our keys anywhere, and thus we won't. + * @author Aizistral (Overwrite) + * @author Aven (Inject) + */ + + @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true) + private void onProfilePublicKey(CallbackInfoReturnable> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(Optional.empty()); + } + } + + /** + * @reason We don't have to send our keys anywhere, and thus we won't. + * @author Aizistral (Overwrite) + * @author Aven (Inject) + */ + + @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) + private void onProfilePublicKeyData(CallbackInfoReturnable> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(Optional.empty()); + } + } + + /** + * @reason Prevent client from trying to produce signature in + * {@link ClientHandshakePacketListenerImpl#handleHello}. + * @author Aizistral (Overwrite) + * @author Aven (Inject) + */ + + @Inject(method = "signer", at = @At("HEAD"), cancellable = true) + private void onSigner(CallbackInfoReturnable> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(null); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java new file mode 100644 index 0000000..eee3bdd --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java @@ -0,0 +1,22 @@ +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.Redirect; + +import com.mojang.bridge.game.GameVersion; + +import net.minecraft.WorldVersion; +import net.minecraft.client.gui.screens.TitleScreen; + +@Mixin(TitleScreen.class) +public class MixinTitleScreen { + + @Redirect(method = "render", at = @At(value = "INVOKE", remap = true, target = + "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0) + private String onGetVersionName(WorldVersion version) { + String original = version.getName(); + return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original; + } + +} 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..7bb6819 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java @@ -0,0 +1,24 @@ +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 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("RETURN"), cancellable = true) + private void onEnforceSecureProfile(CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } + +} \ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java new file mode 100644 index 0000000..c97bde5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java @@ -0,0 +1,27 @@ +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) +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) + */ + + @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true) + private void onGetProfileKey(CallbackInfoReturnable info) { + info.setReturnValue(null); + } + +} 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..75aa7e0 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -0,0 +1,48 @@ +package com.aizistral.nochatreports.mixins.server; + +import com.aizistral.nochatreports.core.NoReportsConfig; + +import net.minecraft.core.Registry; +import net.minecraft.network.chat.ChatTypeDecoration; +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.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.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", at = @At("HEAD"), cancellable = true) + private void onSend(Packet packet, CallbackInfo info) { + if (NoReportsConfig.convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat) { + Component component = chat.unsignedContent().orElse(chat.signedContent()); + ChatTypeDecoration decoration = player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.typeId()).chat(); + component = decoration.decorate(component, chat.sender()); + packet = new ClientboundSystemChatPacket(component, false); + + info.cancel(); + this.send(packet); + } + } + } + +} 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..93da925 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java @@ -0,0 +1,31 @@ +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 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("RETURN"), cancellable = true) + private void onGetSignature(UUID id, CallbackInfoReturnable info) { + info.setReturnValue(new MessageSignature(Util.NIL_UUID, info.getReturnValue().timeStamp(), SaltSignaturePair.EMPTY)); + } + +} diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index 72c4625..4b7a078 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -5,27 +5,27 @@ "compatibilityLevel": "JAVA_17", "verbose": true, "mixins": [ - "MixinPlayer", - "MixinServerboundChatPacket", - "MixinServerGamePacketListenerImpl" + "server.MixinPlayer", + "server.MixinServerboundChatPacket", + "server.MixinServerGamePacketListenerImpl" ], "client": [ - "MixinLocalPlayer", - "MixinChatListener", - "MixinOptions", - "MixinProfileKeyPairManager", - "MixinClientTelemetryManager", - "MixinTitleScreen", - "MixinMinecraft", - "MixinPlayerEntry", - "MixinChatScreen", - "AccessorDisconnectedScreen", - "MixinConnectScreen", - "MixinClientboundHelloPacket", - "MixinJoinMultiplayerScreen" + "client.MixinLocalPlayer", + "client.MixinChatListener", + "client.MixinOptions", + "client.MixinProfileKeyPairManager", + "client.MixinClientTelemetryManager", + "client.MixinTitleScreen", + "client.MixinMinecraft", + "client.MixinPlayerEntry", + "client.MixinChatScreen", + "client.AccessorDisconnectedScreen", + "client.MixinConnectScreen", + "client.MixinClientboundHelloPacket", + "client.MixinJoinMultiplayerScreen" ], "server": [ - "MixinDedicatedServer" + "server.MixinDedicatedServer" ], "injectors": { "defaultRequire": 1 -- cgit v1.2.3