Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/tel/eden/mod/chat/ImagePreviewManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,17 @@ private static int[] renderSize(String url) {
}

public static void renderPreview(GuiGraphics guiGraphics, String url, int x, int y) {
PreviewState state = states.computeIfAbsent(url, k -> {
downloadImage(url);
return PreviewState.DOWNLOADING;
});
PreviewState state = states.get(url);
if (state == null) {
PreviewState initial = isPreviewable(url) ? PreviewState.DOWNLOADING : PreviewState.ERROR;
PreviewState previous = states.putIfAbsent(url, initial);
state = previous != null ? previous : initial;
if (previous == null && initial == PreviewState.DOWNLOADING) {
downloadImage(url);
// downloadImage may fail synchronously during its defensive validation.
state = states.getOrDefault(url, PreviewState.DOWNLOADING);
}
}

if (state == PreviewState.DOWNLOADING && pendingImages.containsKey(url)) {
Frames frames = pendingImages.remove(url);
Expand Down
11 changes: 9 additions & 2 deletions src/tel/eden/mod/mixin/GuiGraphicsMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.Style;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -18,8 +19,14 @@ private void onRenderComponentHoverEffect(Font font, Style style, int mouseX, in
if (style != null && style.getHoverEvent() instanceof net.minecraft.network.chat.HoverEvent.ShowText st) {
String hoverStr = st.value().getString();
int idx = hoverStr.indexOf(ImagePreviewManager.HOVER_MARKER);
if (idx != -1) {
String url = hoverStr.substring(idx + ImagePreviewManager.HOVER_MARKER.length());
if (idx != -1 && style.getClickEvent() instanceof ClickEvent.OpenUrl openUrl) {
// Other chat mods may append click hints to the visible hover text. Read
// the canonical target from the click event instead of treating everything
// after HOVER_MARKER as part of the URL.
String url = openUrl.uri().toString();
if (!ImagePreviewManager.isPreviewable(url)) {
return;
}
GuiGraphics guiGraphics = (GuiGraphics) (Object) this;
Minecraft mc = Minecraft.getInstance();
int screenWidth = mc.getWindow().getGuiScaledWidth();
Expand Down
Loading