diff options
Diffstat (limited to 'src/main/java')
13 files changed, 307 insertions, 114 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 5a06ce3..4ac9c22 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -16,6 +16,7 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerGamePacketListenerImpl; @@ -38,6 +39,8 @@ public class NoChatReports implements ModInitializer { if (NoReportsConfig.demandsOnClient() && !ServerPlayNetworking.canSend(handler, CHANNEL)) { handler.disconnect(Component.literal("You do not have No Chat Reports, and this server is configured to require it on client!")); } + + //handler.disconnect(Component.translatable("multiplayer.disconnect.missing_public_key")); }); } } diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 1586756..ccd931d 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -53,20 +53,29 @@ public class NoChatReportsClient implements ClientModInitializer { if (screenOverride) return; + screenOverride = true; if (dsc.getReason().getContents() instanceof TranslatableContents contents) { if (ServerSafetyState.allowsUnsafeServer()) { - screenOverride = true; screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), CommonComponents.CONNECT_FAILED, dsc.getReason()); client.setScreen(screen); - screenOverride = false; return; } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { - screenOverride = true; - client.setScreen(new UnsafeServerScreen()); - screenOverride = false; + 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; } } @@ -76,22 +85,16 @@ public class NoChatReportsClient implements ClientModInitializer { private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) { client.execute(() -> { + ServerSafetyState.setReconnectCount(0); + if (!client.isLocalServer()) { - String ip = ServerSafetyState.getLastConnectedServer().getHost() + ":" - + ServerSafetyState.getLastConnectedServer().getPort(); boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL); if (canSend) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); } else { - ServerSafetyState.updateCurrent(ServerSafetyState.allowsUnsafeServer() ? + ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ? ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE); - - if (ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); - } else { - // NO-OP - } } } @@ -101,4 +104,10 @@ public class NoChatReportsClient implements ClientModInitializer { }); } + 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 index 9f61326..d1ce3b6 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -11,19 +11,21 @@ import java.util.List; import javax.annotation.Nullable; +import com.aizistral.nochatreports.NoChatReports; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; +import net.minecraft.client.multiplayer.resolver.ServerAddress; import net.minecraft.util.Tuple; public class NoReportsConfig { private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; - private boolean demandOnClient, demandOnServer, convertToGameMessage = true, - forceAllowMultiplayer = true, showServerSafety = true; + private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true, + forceAllowMultiplayer = true, showServerSafety = true, suppressMessageTrustIndicators = true; private List<String> whitelistedServers; private static NoReportsConfig getInstance() { @@ -35,6 +37,8 @@ public class NoReportsConfig { } public static void loadConfig() { + NoChatReports.LOGGER.info(INSTANCE == null ? "Loading config..." : "Reloading config..."); + INSTANCE = readFile(); if (INSTANCE == null) { @@ -98,4 +102,16 @@ public class NoReportsConfig { return getInstance().whitelistedServers; } + public static boolean isWhitelistedServer(ServerAddress address) { + return getWhitelistedServers().contains(address.getHost() + ":" + address.getPort()); + } + + public static boolean suppressMessageTrustIndicators() { + return getInstance().suppressMessageTrustIndicators; + } + + public static boolean isDebugLogEnabled() { + return getInstance().enableDebugLog; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index 8fbe357..9bff76b 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -5,13 +5,22 @@ import java.util.Map; import javax.annotation.Nullable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.resolver.ServerAddress; +/** + * All this global state is questionable, but we have to... + * @author Aizistral + */ + +@Environment(EnvType.CLIENT) public class ServerSafetyState { private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN; private static ServerAddress lastConnectedServer = null; - private static boolean allowUnsafeServer = false; + private static boolean allowUnsafeServer = false, sessionRequestedKey = false; + private static int reconnectCount = 0; public static void updateCurrent(ServerSafetyLevel level) { current = level; @@ -29,6 +38,18 @@ public class ServerSafetyState { 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; @@ -38,9 +59,17 @@ public class ServerSafetyState { lastConnectedServer = address; } + public static int getReconnectCount() { + return reconnectCount; + } + + public static void setReconnectCount(int count) { + reconnectCount = count; + } + public static void reset() { current = ServerSafetyLevel.UNKNOWN; - allowUnsafeServer = false; + 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 index efccc4e..a51fc45 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -2,6 +2,7 @@ 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; @@ -42,11 +43,10 @@ public class UnsafeServerScreen extends WarningScreen { if (this.stopShowing.selected()) { NoReportsConfig.getWhitelistedServers().add(address.getHost() + ":" + address.getPort()); NoReportsConfig.saveConfig(); - } else { - ServerSafetyState.setAllowsUnsafeServer(true); } - ConnectScreen.startConnecting(this, this.minecraft, address, null); + ServerSafetyState.setAllowsUnsafeServer(true); + NoChatReportsClient.reconnectLastServer(); } })); this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java index c043f1a..5d90beb 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java @@ -1,11 +1,14 @@ 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; @@ -26,7 +29,17 @@ public class MixinChatListener { @Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true) private void onEvaluateTrustLevel(ChatSender chatSender, PlayerChatMessage playerChatMessage, Component component, PlayerInfo playerInfo, CallbackInfoReturnable<ChatTrustLevel> info) { - info.setReturnValue(ChatTrustLevel.SECURE); + 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 index ad332d2..ed374a2 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java @@ -34,14 +34,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; @Mixin(ChatScreen.class) -public abstract class MixinChatScreen extends Screen { +public abstract class MixinChatScreen extends MixinScreen { private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png"); - protected MixinChatScreen(Component component) { - super(component); - throw new IllegalStateException("Can't touch this"); - } - @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { if (!NoReportsConfig.showServerSafety()) @@ -66,83 +61,4 @@ public abstract class MixinChatScreen extends Screen { }; } - private void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) { - this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); - } - - private void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) { - ClientTooltipComponent clientTooltipComponent2; - int v; - int m; - if (list.isEmpty()) - return; - int k = 0; - int l = list.size() == 1 ? -2 : 0; - for (ClientTooltipComponent clientTooltipComponent : list) { - m = clientTooltipComponent.getWidth(this.font); - if (m > k) { - k = m; - } - l += clientTooltipComponent.getHeight(); - } - int n = i + 12; - int o = j - 12; - m = k; - int p = l; - if (n + k > this.width) { - n -= 28 + k; - } - if (o + p + 6 > this.height) { - o = this.height - p - 6; - } - if (j - p - 8 < 0) { - o = j + 8; - } - poseStack.pushPose(); - int q = -267386864; - int r = 0x505000FF; - int s = 1344798847; - int t = 400; - float f = this.itemRenderer.blitOffset; - this.itemRenderer.blitOffset = 400.0f; - Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder bufferBuilder = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - Matrix4f matrix4f = poseStack.last().pose(); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847); - RenderSystem.enableDepthTest(); - RenderSystem.disableTexture(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - BufferUploader.drawWithShader(bufferBuilder.end()); - RenderSystem.disableBlend(); - RenderSystem.enableTexture(); - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); - poseStack.translate(0.0, 0.0, 400.0); - int u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource); - u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/; - } - bufferSource.endBatch(); - poseStack.popPose(); - u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400); - u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0); - } - this.itemRenderer.blitOffset = f; - } - } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java new file mode 100644 index 0000000..b14c9bc --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java @@ -0,0 +1,22 @@ +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 index a850aed..92922b4 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java @@ -6,6 +6,7 @@ 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; @@ -22,13 +23,14 @@ 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.reset(); // just to be 100% sure + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure ServerSafetyState.setLastConnectedServer(serverAddress); - if (serverAddress != null) - if (NoReportsConfig.getWhitelistedServers().contains(serverAddress.getHost() + ":" + serverAddress.getPort())) { - ServerSafetyState.setAllowsUnsafeServer(true); - } + 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/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java new file mode 100644 index 0000000..3fd542e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java @@ -0,0 +1,47 @@ +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 MixinScreen { + 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"); + + @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); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java index 2fa727f..3856337 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java @@ -27,7 +27,7 @@ public class MixinLocalPlayer { @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> info) { - if (!ServerSafetyState.allowsUnsafeServer()) { + if (!ServerSafetyState.forceSignedMessages()) { info.setReturnValue(MessageSignature.unsigned()); } } @@ -40,7 +40,7 @@ public class MixinLocalPlayer { @Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true) private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, CallbackInfoReturnable<ArgumentSignatures> info) { - if (!ServerSafetyState.allowsUnsafeServer()) { + if (!ServerSafetyState.forceSignedMessages()) { info.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 index f5ded0d..73734e9 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java @@ -9,6 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.core.ServerSafetyState; import java.util.Optional; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java new file mode 100644 index 0000000..a638ac3 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java @@ -0,0 +1,135 @@ +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.Shadow; + +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.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.events.AbstractContainerEventHandler; +import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.gui.narration.NarratableEntry; +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.client.renderer.entity.ItemRenderer; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; + +/** + * The fact this has to exist for a couple tooltip rendering methods is ridiculous, + * but not much we can do here. + * + * @author Aizistral + */ + +@Mixin(Screen.class) +public abstract class MixinScreen extends AbstractContainerEventHandler implements Widget { + @Shadow public int width; + @Shadow public int height; + @Shadow protected Font font; + @Shadow protected ItemRenderer itemRenderer; + @Shadow protected Minecraft minecraft; + + @Shadow + protected abstract <T extends GuiEventListener & Widget> T addRenderableWidget(T guiEventListener); + + @Shadow + protected abstract <T extends Widget> T addRenderableOnly(T widget); + + @Shadow + protected abstract <T extends GuiEventListener & NarratableEntry> T addWidget(T guiEventListener); + + 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; + } + +} |
