resource = Minecraft.getInstance().getResourceManager().getResource(location);
+ if (resource.isEmpty()) {
+ Oracle.LOGGER.warn("Wiki audio not found: {}", location);
+ return false;
+ }
+
+ SoundManager soundManager = Minecraft.getInstance().getSoundManager();
+ soundManager.soundCache.putIfAbsent(location, resource.get());
+
+ stop();
+
+ WikiSoundInstance instance = new WikiSoundInstance(location);
+ if (soundManager.play(instance) == PlayResult.NOT_STARTED) return false;
+
+ playing = instance;
+ return true;
+ }
+
+ public static void stop() {
+ if (playing == null) return;
+
+ Minecraft.getInstance().getSoundManager().stop(playing);
+ playing = null;
+ }
+
+ public static void release() {
+ stop();
+ }
+
+ private static class WikiSound extends Sound {
+ private WikiSound(Identifier location) {
+ super(location, ConstantFloat.of(1.0F), ConstantFloat.of(1.0F), 1, Type.FILE, false, false, ATTENUATION_DISTANCE);
+ }
+
+ @Override
+ public Identifier getPath() {
+ return getLocation();
+ }
+ }
+
+ private static class WikiSoundInstance implements SoundInstance {
+ private final Sound sound;
+ private final WeighedSoundEvents events;
+
+ WikiSoundInstance(Identifier location) {
+ this.sound = new WikiSound(location);
+ this.events = new WeighedSoundEvents(location, null);
+ this.events.addSound(this.sound);
+ }
+
+ @Override
+ public Identifier getIdentifier() {
+ return sound.getLocation();
+ }
+
+ @Override
+ public WeighedSoundEvents resolve(SoundManager soundManager) {
+ return events;
+ }
+
+ @Override
+ public Sound getSound() {
+ return sound;
+ }
+
+ @Override
+ public SoundSource getSource() {
+ return SoundSource.MASTER;
+ }
+
+ @Override
+ public boolean isLooping() {
+ return false;
+ }
+
+ @Override
+ public boolean isRelative() {
+ return true;
+ }
+
+ @Override
+ public int getDelay() {
+ return 0;
+ }
+
+ @Override
+ public float getVolume() {
+ return 1.0F;
+ }
+
+ @Override
+ public float getPitch() {
+ return 1.0F;
+ }
+
+ @Override
+ public double getX() {
+ return 0;
+ }
+
+ @Override
+ public double getY() {
+ return 0;
+ }
+
+ @Override
+ public double getZ() {
+ return 0;
+ }
+
+ @Override
+ public Attenuation getAttenuation() {
+ return Attenuation.NONE;
+ }
+ }
+}
diff --git a/common/src/main/java/rearth/oracle/util/CalloutVariant.java b/common/src/main/java/rearth/oracle/util/CalloutVariant.java
index d5bb57b..2207b36 100644
--- a/common/src/main/java/rearth/oracle/util/CalloutVariant.java
+++ b/common/src/main/java/rearth/oracle/util/CalloutVariant.java
@@ -1,13 +1,17 @@
package rearth.oracle.util;
+import net.minecraft.network.chat.Component;
import rearth.oracle.ui.widgets.WikiSurface;
+import java.util.Locale;
+
public enum CalloutVariant {
- DEFAULT(WikiSurface.BEDROCK_PANEL_NOTE),
- INFO(WikiSurface.BEDROCK_PANEL_PRESSED),
+ NOTE(WikiSurface.BEDROCK_PANEL_NOTE),
+ TIP(WikiSurface.BEDROCK_PANEL_PRESSED),
+ IMPORTANT(WikiSurface.BEDROCK_PANEL_IMPORTANT),
WARNING(WikiSurface.BEDROCK_PANEL_WARNING),
- DANGER(WikiSurface.BEDROCK_PANEL_DANGER);
-
+ CAUTION(WikiSurface.BEDROCK_PANEL_DANGER);
+
private final WikiSurface surface;
CalloutVariant(WikiSurface surface) {
@@ -17,4 +21,20 @@ public enum CalloutVariant {
public WikiSurface getSurface() {
return surface;
}
+
+ public Component getTitle() {
+ return Component.translatable("oracle_index.callout." + name().toLowerCase(Locale.ROOT));
+ }
+
+ public static CalloutVariant byName(String name, CalloutVariant fallback) {
+ if (name == null) return fallback;
+ return switch (name.trim().toLowerCase(Locale.ROOT)) {
+ case "default", "info", "note" -> NOTE;
+ case "important" -> IMPORTANT;
+ case "tip" -> TIP;
+ case "warning" -> WARNING;
+ case "danger", "caution", "error" -> CAUTION;
+ default -> fallback;
+ };
+ }
}
diff --git a/common/src/main/java/rearth/oracle/util/HoverText.java b/common/src/main/java/rearth/oracle/util/HoverText.java
new file mode 100644
index 0000000..97c0037
--- /dev/null
+++ b/common/src/main/java/rearth/oracle/util/HoverText.java
@@ -0,0 +1,77 @@
+package rearth.oracle.util;
+
+import org.commonmark.node.CustomNode;
+import org.commonmark.parser.beta.InlineContentParser;
+import org.commonmark.parser.beta.InlineContentParserFactory;
+import org.commonmark.parser.beta.InlineParserState;
+import org.commonmark.parser.beta.ParsedInline;
+import org.commonmark.parser.beta.Scanner;
+
+import java.util.Set;
+
+/**
+ * Inline node produced by the wiki's hover text syntax: {@code ?[label](hint shown on hover)}.
+ *
+ * Unlike a link destination the hint may contain spaces, so this cannot be expressed with
+ * plain markdown and needs its own inline parser.
+ */
+public class HoverText extends CustomNode {
+
+ private final String label;
+ private final String hint;
+
+ public HoverText(String label, String hint) {
+ this.label = label;
+ this.hint = hint;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public String getHint() {
+ return hint;
+ }
+
+ @Override
+ public String toString() {
+ return "HoverText{label='" + label + "', hint='" + hint + "'}";
+ }
+
+ public static class ParserFactory implements InlineContentParserFactory {
+
+ @Override
+ public Set getTriggerCharacters() {
+ return Set.of('?');
+ }
+
+ @Override
+ public InlineContentParser create() {
+ return new Parser();
+ }
+ }
+
+ private static class Parser implements InlineContentParser {
+
+ @Override
+ public ParsedInline tryParse(InlineParserState state) {
+ var scanner = state.scanner();
+ scanner.next(); // '?'
+ if (!scanner.next('[')) return ParsedInline.none();
+
+ var labelStart = scanner.position();
+ if (scanner.find(']') < 0) return ParsedInline.none();
+ var label = scanner.getSource(labelStart, scanner.position()).getContent();
+ scanner.next(); // ']'
+
+ if (!scanner.next('(')) return ParsedInline.none();
+ var hintStart = scanner.position();
+ if (scanner.find(')') < 0) return ParsedInline.none();
+ var hint = scanner.getSource(hintStart, scanner.position()).getContent();
+ scanner.next(); // ')'
+
+ if (label.isEmpty() || hint.isEmpty()) return ParsedInline.none();
+ return ParsedInline.of(new HoverText(label, hint), scanner.position());
+ }
+ }
+}
diff --git a/common/src/main/java/rearth/oracle/util/MarkdownParser.java b/common/src/main/java/rearth/oracle/util/MarkdownParser.java
index 8efacd0..dc0d253 100644
--- a/common/src/main/java/rearth/oracle/util/MarkdownParser.java
+++ b/common/src/main/java/rearth/oracle/util/MarkdownParser.java
@@ -1,33 +1,37 @@
package rearth.oracle.util;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
-import com.mojang.blaze3d.platform.NativeImage;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.Component;
import net.minecraft.nbt.StringTag;
-import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.*;
import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
import org.apache.commons.lang3.StringUtils;
import org.commonmark.Extension;
import org.commonmark.ext.front.matter.YamlFrontMatterExtension;
import org.commonmark.ext.front.matter.YamlFrontMatterVisitor;
+import org.commonmark.ext.gfm.tables.*;
import org.commonmark.node.*;
import org.commonmark.parser.Parser;
import org.jetbrains.annotations.Nullable;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Element;
import rearth.oracle.Oracle;
import rearth.oracle.OracleClient;
import rearth.oracle.ui.OracleScreen;
import rearth.oracle.ui.widgets.*;
+import rearth.oracle.ui.widgets.FlowWidget.HorizontalAlignment;
+import rearth.oracle.ui.widgets.TableWidget.Cell;
+import rearth.oracle.util.MdxAttributes.Match;
import java.io.IOException;
import java.util.*;
import java.util.function.Predicate;
+import java.util.regex.Pattern;
import static rearth.oracle.OracleClient.ROOT_DIR;
@@ -38,10 +42,10 @@
public class MarkdownParser {
private static final Identifier WIKI_LINK_EVENT =
- Identifier.fromNamespaceAndPath(Oracle.MOD_ID, "wiki_link");
+ Identifier.fromNamespaceAndPath(Oracle.MOD_ID, "wiki_link");
private static final String[] removedLines = {"", "", "", "
", "", ""};
- private static final List EXTENSIONS = List.of(YamlFrontMatterExtension.create());
+ private static final List EXTENSIONS = List.of(YamlFrontMatterExtension.create(), TablesExtension.create());
private static final Set> ENABLED_BLOCKS = Set.of(
Heading.class, HtmlBlock.class, ThematicBreak.class,
FencedCodeBlock.class, BlockQuote.class, ListBlock.class
@@ -51,6 +55,7 @@ public class MarkdownParser {
.enabledBlockTypes(ENABLED_BLOCKS)
.extensions(EXTENSIONS)
.customBlockParserFactory(new MdxBlockFactory())
+ .customInlineContentParserFactory(new HoverText.ParserFactory())
.build();
/**
@@ -156,6 +161,31 @@ private void flushBuffer() {
currentIndentation = 0;
}
+ private List collectChildren(Node node) {
+ var previousComponents = this.components;
+ var previousBuffer = this.buffer;
+ var collected = new ArrayList();
+ this.components = collected;
+ this.buffer = Component.empty();
+ visitChildren(node);
+ flushBuffer();
+ this.components = previousComponents;
+ this.buffer = previousBuffer;
+ return collected;
+ }
+
+ private MutableComponent collectInline(Node node, Style baseStyle) {
+ var previousBuffer = this.buffer;
+ var previousStyle = this.currentStyle;
+ this.buffer = Component.empty();
+ this.currentStyle = baseStyle;
+ visitChildren(node);
+ var collected = this.buffer;
+ this.buffer = previousBuffer;
+ this.currentStyle = previousStyle;
+ return collected;
+ }
+
@Override
public void visit(Paragraph paragraph) {
visitChildren(paragraph);
@@ -165,6 +195,7 @@ public void visit(Paragraph paragraph) {
@Override
public void visit(Heading heading) {
buffer = Component.empty();
+ stripHeadingAttributes(heading);
var oldStyle = currentStyle;
currentStyle = currentStyle.withColor(ChatFormatting.GRAY);
visitChildren(heading);
@@ -185,12 +216,25 @@ public void visit(Heading heading) {
@Override
public void visit(FencedCodeBlock codeBlock) {
flushBuffer();
- var panel = FlowWidget.vertical();
- panel.setSurface(WikiSurface.BEDROCK_PANEL_DARK);
- panel.setPadding(Insets.of(6));
- var text = Component.literal(codeBlock.getLiteral()).withStyle(ChatFormatting.GRAY);
- panel.child(new LabelWidget(text));
- components.add(panel);
+ CodeFence fence = CodeFence.parse(codeBlock.getInfo());
+ components.add(new CodeBlockWidget(fence.fileName(), fence.language(), codeBlock.getLiteral()));
+ }
+
+ @Override
+ public void visit(BlockQuote blockQuote) {
+ flushBuffer();
+ GitHubAlert alert = GitHubAlert.consume(blockQuote);
+ List inner = collectChildren(blockQuote);
+
+ if (alert != null) {
+ CalloutWidget callout = new CalloutWidget(alert.variant(), alert.title(), alert.collapsible(), alert.collapsed());
+ for (var c : inner) callout.addBodyChild(c);
+ components.add(callout);
+ } else {
+ var quote = new BlockQuoteWidget();
+ for (var c : inner) quote.child(c);
+ components.add(quote);
+ }
}
@Override
@@ -234,28 +278,132 @@ public void visit(ListItem listItem) {
@Override
public void visit(CustomBlock customBlock) {
- if (customBlock instanceof MdxComponentBlock.CraftingRecipeBlock recipe) {
- components.add(buildRecipe(recipe.slots, recipe.result, recipe.count));
- } else if (customBlock instanceof MdxComponentBlock.AssetBlock image) {
- components.add(buildImage(image.location, image.width, this.wikiId, contentWidthPx));
- } else if (customBlock instanceof MdxComponentBlock.CalloutBlock callout) {
- var oldComponents = this.components;
- var inner = new ArrayList();
- this.components = inner;
- visitChildren(callout);
- flushBuffer();
- this.components = oldComponents;
+ switch (customBlock) {
+ case MdxComponentBlock.CraftingRecipeBlock recipe -> {
+ flushBuffer();
+ components.add(buildRecipe(recipe.slots, recipe.result, recipe.count));
+ }
+ case MdxComponentBlock.AssetBlock asset -> {
+ flushBuffer();
+ components.add(buildImage(asset.location, ImageStyle.ofWidthSource(asset.width), wikiId, contentWidthPx));
+ }
+ case MdxComponentBlock.CalloutBlock callout -> {
+ flushBuffer();
+ var inner = collectChildren(callout);
+ var title = callout.title == null ? null : Component.literal(callout.title);
+ var widget = new CalloutWidget(callout.variant, title, callout.collapsible, callout.collapsed);
+ for (var c : inner) widget.addBodyChild(c);
+ components.add(widget);
+ }
+ case MdxComponentBlock.AudioBlock audio -> {
+ flushBuffer();
+ var widget = buildAudio(audio.src, wikiId);
+ if (widget != null) components.add(widget);
+ }
+ case MdxComponentBlock.VideoEmbedBlock video -> {
+ flushBuffer();
+ if (video.videoId != null && !video.videoId.isBlank()) {
+ components.add(new VideoEmbedWidget(video.videoId, linkHandler));
+ }
+ }
+ case MdxComponentBlock.CodeTabsBlock codeTabs -> {
+ flushBuffer();
+ var widget = buildCodeTabs(codeTabs);
+ if (widget != null) components.add(widget);
+ }
+ case TableBlock table -> buildTable(table);
+ default -> visitChildren(customBlock);
+ }
+ }
- var widget = new CalloutWidget(callout.variant);
- for (var c : inner) widget.addBodyChild(c);
- components.add(widget);
+ @Override
+ public void visit(CustomNode customNode) {
+ if (customNode instanceof HoverText hoverText) {
+ var style = currentStyle
+ .withUnderlined(true)
+ .withHoverEvent(new HoverEvent.ShowText(Component.literal(hoverText.getHint())));
+ buffer.append(Component.literal(hoverText.getLabel()).setStyle(style));
+ return;
+ }
+ super.visit(customNode);
+ }
+
+ @Override
+ public void visit(HtmlBlock htmlBlock) {
+ visitRawHtml(htmlBlock.getLiteral());
+ }
+
+ @Override
+ public void visit(HtmlInline htmlInline) {
+ visitRawHtml(htmlInline.getLiteral());
+ }
+
+ private void visitRawHtml(String html) {
+ org.jsoup.nodes.Document fragment = Jsoup.parseBodyFragment(html);
+
+ Element image = fragment.selectFirst("img");
+ if (image != null && image.hasAttr("src")) {
+ flushBuffer();
+ components.add(buildImage(image.attr("src"), ImageStyle.ofHtml(image), wikiId, contentWidthPx));
}
}
@Override
public void visit(Image image) {
+ ImageStyle style = ImageStyle.consume(image);
+ UIComponent widget = buildImage(image.getDestination(), style, wikiId, contentWidthPx);
flushBuffer();
- components.add(buildImage(image.getDestination(), "60%", wikiId, contentWidthPx));
+
+ String caption = altText(image);
+ if (isStandalone(image) && !caption.isBlank()) {
+ components.add(new FigureWidget(widget, Component.literal(caption), style.alignment()));
+ } else {
+ components.add(widget);
+ }
+ }
+
+ private void buildTable(TableBlock table) {
+ flushBuffer();
+ ArrayList> rows = new ArrayList<>();
+ boolean hasHeader = false;
+
+ for (Node section = table.getFirstChild(); section != null; section = section.getNext()) {
+ boolean header = section instanceof TableHead;
+
+ for (Node row = section.getFirstChild(); row != null; row = row.getNext()) {
+ if (!(row instanceof TableRow)) continue;
+
+ ArrayList cells = new ArrayList<>();
+ for (Node cell = row.getFirstChild(); cell != null; cell = cell.getNext()) {
+ if (!(cell instanceof TableCell tableCell)) continue;
+
+ Style style = header ? Style.EMPTY.withBold(true) : Style.EMPTY;
+ cells.add(new TableWidget.Cell(collectInline(tableCell, style), getCellAlignment(tableCell)));
+ }
+
+ if (header) hasHeader = true;
+ rows.add(cells);
+ }
+ }
+
+ if (!rows.isEmpty()) {
+ components.add(new TableWidget(rows, hasHeader, linkHandler));
+ }
+ }
+
+ @Nullable
+ private UIComponent buildCodeTabs(Node container) {
+ var tabs = new ArrayList();
+ for (var child = container.getFirstChild(); child != null; child = child.getNext()) {
+ if (!(child instanceof FencedCodeBlock code)) continue;
+ var fence = CodeFence.parse(code.getInfo());
+ var title = fence.tabTitle() != null ? fence.tabTitle()
+ : fence.fileName() != null ? fence.fileName()
+ : fence.language() != null ? fence.language()
+ : "Tab " + (tabs.size() + 1);
+ tabs.add(new CodeTabsWidget.Tab(title, code.getLiteral()));
+ }
+ return tabs.isEmpty() ? null : new CodeTabsWidget(tabs);
}
@Override
@@ -283,8 +431,8 @@ public void visit(Emphasis e) {
public void visit(Link link) {
var old = currentStyle;
var clickEvent = new ClickEvent.Custom(
- WIKI_LINK_EVENT,
- Optional.of(StringTag.valueOf(link.getDestination()))
+ WIKI_LINK_EVENT,
+ Optional.of(StringTag.valueOf(link.getDestination()))
);
currentStyle = currentStyle.withColor(ChatFormatting.BLUE).withUnderlined(true).withClickEvent(clickEvent);
@@ -314,9 +462,166 @@ public void visit(HardLineBreak n) {
}
}
+ private static void stripHeadingAttributes(Heading heading) {
+ Node last = heading.getLastChild();
+ if (!(last instanceof org.commonmark.node.Text text)) return;
+
+ Match match = MdxAttributes.matchTrailing(text.getLiteral());
+ if (match == null) return;
+
+ text.setLiteral(match.remainder());
+ }
+
+ private static boolean isStandalone(Image image) {
+ if (!(image.getParent() instanceof Paragraph paragraph)) return false;
+
+ for (var sibling = paragraph.getFirstChild(); sibling != null; sibling = sibling.getNext()) {
+ if (sibling == image || sibling instanceof Text text && text.getLiteral().isBlank() || sibling instanceof SoftLineBreak)
+ continue;
+ return false;
+ }
+
+ return true;
+ }
+
+ private static String altText(Image image) {
+ StringBuilder alt = new StringBuilder();
+ for (var child = image.getFirstChild(); child != null; child = child.getNext()) {
+ if (child instanceof org.commonmark.node.Text text) {
+ alt.append(text.getLiteral());
+ }
+ }
+ return alt.toString().trim();
+ }
+
+ public record CodeFence(@Nullable String language, @Nullable String fileName, @Nullable String tabTitle) {
+ private static final String TABS_MARKER = "!!tabs";
+
+ public static CodeFence parse(@Nullable String info) {
+ if (info == null || info.isBlank()) return new CodeFence(null, null, null);
+ String[] tokens = info.trim().split("\\s+");
+ String language = tokens[0].isBlank() ? null : tokens[0];
+
+ String fileName = null;
+ String tabTitle = null;
+ for (int i = 1; i < tokens.length; i++) {
+ if (TABS_MARKER.equals(tokens[i])) {
+ if (i + 1 < tokens.length) tabTitle = String.join(" ", Arrays.copyOfRange(tokens, i + 1, tokens.length));
+ break;
+ }
+ fileName = fileName == null ? tokens[i] : fileName + " " + tokens[i];
+ }
+
+ return new CodeFence(language, fileName, tabTitle);
+ }
+ }
+
+ public record GitHubAlert(CalloutVariant variant, @Nullable Component title, boolean collapsible, boolean collapsed) {
+ private static final Pattern HEADER = Pattern.compile("^\\[!(NOTE|TIP|IMPORTANT|WARNING|CAUTION)]([+-]?)\\s*(.*)$");
+
+ @Nullable
+ public static GitHubAlert consume(BlockQuote blockQuote) {
+ if (!(blockQuote.getFirstChild() instanceof Paragraph paragraph)) return null;
+
+ // collect the first line's plain text; formatting inside the header is not supported
+ var line = new StringBuilder();
+ var consumed = new ArrayList();
+ Node lineBreak = null;
+ for (var child = paragraph.getFirstChild(); child != null; child = child.getNext()) {
+ if (child instanceof org.commonmark.node.Text text) {
+ line.append(text.getLiteral());
+ consumed.add(child);
+ } else if (child instanceof SoftLineBreak || child instanceof HardLineBreak) {
+ lineBreak = child;
+ break;
+ } else {
+ break;
+ }
+ }
+
+ var matcher = HEADER.matcher(line.toString().trim());
+ if (!matcher.matches()) return null;
+
+ for (var node : consumed) node.unlink();
+ if (lineBreak != null) lineBreak.unlink();
+ if (paragraph.getFirstChild() == null) paragraph.unlink();
+
+ var variant = CalloutVariant.byName(matcher.group(1), CalloutVariant.NOTE);
+ var marker = matcher.group(2);
+ var title = matcher.group(3).isBlank() ? null : Component.literal(matcher.group(3).trim());
+ boolean collapsed = "-".equals(marker);
+ boolean collapsible = collapsed || "+".equals(marker);
+ return new GitHubAlert(variant, title, collapsible, collapsed);
+ }
+ }
+
+ public record ImageStyle(@Nullable Float widthRatio, @Nullable Integer width, @Nullable Integer height,
+ boolean item, FlowWidget.HorizontalAlignment alignment
+ ) {
+ private static final int ITEM_SIZE = 32;
+
+ public static final ImageStyle DEFAULT = new ImageStyle(null, null, null, false, FlowWidget.HorizontalAlignment.CENTER);
+
+ private static ImageStyle consume(Image image) {
+ if (!(image.getNext() instanceof org.commonmark.node.Text text)) return DEFAULT;
+
+ Match match = MdxAttributes.matchLeading(text.getLiteral());
+ if (match == null) return DEFAULT;
+
+ text.setLiteral(match.remainder());
+
+ return of(match.attributes());
+ }
+
+ private static ImageStyle of(MdxAttributes attributes) {
+ HorizontalAlignment alignment = attributes.has("center") || attributes.has("right")
+ ? FlowWidget.HorizontalAlignment.CENTER
+ : FlowWidget.HorizontalAlignment.LEFT;
+ String rawWidth = attributes.get("width");
+ Float ratio = rawWidth != null && rawWidth.endsWith("%") ? convertImageWidth(rawWidth) : null;
+ return new ImageStyle(ratio, attributes.getPixels("width"), attributes.getPixels("height"), attributes.has("item"), alignment);
+ }
+
+ private static ImageStyle ofHtml(Element element) {
+ Map attributes = new HashMap<>();
+ if (element.hasAttr("width")) {
+ attributes.put("width", element.attr("width"));
+ }
+ if (element.hasAttr("height")) {
+ attributes.put("height", element.attr("height"));
+ }
+
+ Set flags = new HashSet<>();
+ for (var name : element.attr("class").split("\\s+")) {
+ if (!name.isBlank()) flags.add(name);
+ }
+
+ if (element.hasAttr("align")) {
+ flags.add(element.attr("align").toLowerCase(Locale.ROOT));
+ }
+
+ return of(new MdxAttributes(attributes, flags));
+ }
+
+ private static ImageStyle ofWidthSource(@Nullable String widthSource) {
+ float ratio = convertImageWidth(widthSource);
+ return new ImageStyle(ratio > 0 ? ratio : null, null, null, false, FlowWidget.HorizontalAlignment.CENTER);
+ }
+
+ private int resolveWidth(int budget, float defaultRatio) {
+ if (item) return ITEM_SIZE;
+ if (width != null && width > 0) return Math.min(width, budget);
+ float ratio = widthRatio != null && widthRatio > 0 ? widthRatio : defaultRatio;
+ return Math.max(16, (int) (budget * ratio));
+ }
+ }
+
// ---------------------------------------------------------------- helpers
public static MutableComponent getLinkText(String link, String activeWikiId, Identifier sourceEntryPath) {
+ int anchor = link.indexOf('#');
+ if (anchor > 0) link = link.substring(0, anchor);
+
if (link.startsWith("@")) {
Identifier id = Identifier.tryParse(link.substring(1));
if (id != null && id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
@@ -387,6 +692,18 @@ private static UIComponent buildTitlePanel(Predicate linkHandler, Frontm
);
}
+ private static FlowWidget.HorizontalAlignment getCellAlignment(TableCell cell) {
+ var alignment = cell.getAlignment();
+ if (alignment == null) {
+ return FlowWidget.HorizontalAlignment.LEFT;
+ }
+ return switch (alignment) {
+ case LEFT -> FlowWidget.HorizontalAlignment.LEFT;
+ case CENTER -> FlowWidget.HorizontalAlignment.CENTER;
+ case RIGHT -> FlowWidget.HorizontalAlignment.RIGHT;
+ };
+ }
+
private static ItemStack getIconStack(String iconId) {
if (Identifier.tryParse(iconId) != null && BuiltInRegistries.ITEM.containsKey(Identifier.parse(iconId))) {
return new ItemStack(BuiltInRegistries.ITEM.getValue(Identifier.parse(iconId)));
@@ -646,20 +963,35 @@ public static UIComponent buildRecipe(List inputs, String resultId, int
return panel;
}
- public static UIComponent buildImage(String location, String widthSource, String wikiId, int contentWidthPx) {
- var widthRatio = convertImageWidth(widthSource);
- if (widthRatio <= 0) widthRatio = 0.5f;
+ public static Identifier resolveAssetPath(String location, String wikiId, String defaultExtension) {
+ if (location.startsWith("@")) location = location.substring(1);
+
+ var assetsRoot = OracleClient.getWikiFormat(wikiId).getAssetsRoot();
+ var parts = location.split(":", 2);
+ var assetModId = parts.length > 1 ? parts[0] : wikiId;
+ var assetPath = parts.length > 1 ? parts[1] : location;
+ var extension = assetPath.contains(".") ? "" : defaultExtension;
+
+ return Identifier.fromNamespaceAndPath(
+ Oracle.MOD_ID,
+ ROOT_DIR + "/" + wikiId + assetsRoot + "/" + assetModId + "/" + assetPath + extension
+ );
+ }
+
+ public static UIComponent buildImage(String location, ImageStyle style, String wikiId, int contentWidthPx) {
+ if (location == null || location.isBlank()) {
+ return new LabelWidget(Component.literal("Missing image location").withStyle(ChatFormatting.RED));
+ }
if (location.startsWith("@")) location = location.substring(1);
// available pixel budget after scrollbar gutter + a tiny breathing margin
var budget = Math.max(16, contentWidthPx - 12);
// case 1: ingame item → render as ItemWidget
- var itemIdCandidate = Identifier.parse(location);
- if (BuiltInRegistries.ITEM.containsKey(itemIdCandidate)) {
- // items default to ~10% of content width when no width is specified
- if (widthRatio == 0.5f) widthRatio = 0.1f;
- int displaySize = Math.max(16, (int) (budget * widthRatio));
+ var itemIdCandidate = Identifier.tryParse(location);
+ if (itemIdCandidate != null && BuiltInRegistries.ITEM.containsKey(itemIdCandidate)) {
+ // items default to ~10% of content width when no size is specified
+ int displaySize = style.resolveWidth(budget, 0.1f);
var itemWidget = new ItemWidget(new ItemStack(BuiltInRegistries.ITEM.getValue(itemIdCandidate)));
itemWidget.size(displaySize, displaySize);
itemWidget.setHideItemDecorations(true);
@@ -667,14 +999,7 @@ public static UIComponent buildImage(String location, String widthSource, String
}
// case 2: texture path
- var assetsRoot = OracleClient.getWikiFormat(wikiId).getAssetsRoot();
- Identifier searchPath;
- var parts = location.split(":", 2);
- var imageModId = parts.length > 0 ? parts[0] : wikiId;
- var imagePath = parts.length > 1 ? parts[1] : location;
- var extension = imagePath.contains(".") ? "" : ".png";
- searchPath = Identifier.fromNamespaceAndPath(Oracle.MOD_ID, ROOT_DIR + "/" + wikiId + assetsRoot + "/" + imageModId + "/" + imagePath + extension);
-
+ var searchPath = resolveAssetPath(location, wikiId, ".png");
var rm = Minecraft.getInstance().getResourceManager();
var resource = rm.getResource(searchPath);
if (resource.isEmpty()) {
@@ -684,12 +1009,15 @@ public static UIComponent buildImage(String location, String widthSource, String
var image = NativeImage.read(resource.get().open());
int srcW = image.getWidth();
int srcH = image.getHeight();
- int displayW = Math.max(16, (int) (budget * widthRatio));
- int displayH = (int) (displayW * (srcH / (float) srcW));
+ int displayW = style.resolveWidth(budget, 0.5f);
+ int displayH = style.item() ? displayW
+ : style.height() != null && style.height() > 0 ? style.height()
+ : (int) (displayW * (srcH / (float) srcW));
+ var alignment = style.alignment();
var widget = new TextureWidget(searchPath, srcW, srcH) {
@Override
- public @Nullable FlowWidget.HorizontalAlignment getOverrideAlignment() {
- return FlowWidget.HorizontalAlignment.CENTER;
+ public FlowWidget.HorizontalAlignment getOverrideAlignment() {
+ return alignment;
}
};
widget.region(0, 0, srcW, srcH);
@@ -700,6 +1028,16 @@ public static UIComponent buildImage(String location, String widthSource, String
}
}
+ @Nullable
+ public static UIComponent buildAudio(@Nullable String source, String wikiId) {
+ if (source == null || source.isBlank()) return null;
+
+ Identifier path = resolveAssetPath(source, wikiId, ".ogg");
+ String[] segments = path.getPath().split("/");
+
+ return new AudioWidget(path, segments[segments.length - 1]);
+ }
+
public static Frontmatter parseFrontmatter(String markdown) {
var document = PARSER.parse(markdown);
var yamlVisitor = new YamlFrontMatterVisitor();
diff --git a/common/src/main/java/rearth/oracle/util/MdxAttributes.java b/common/src/main/java/rearth/oracle/util/MdxAttributes.java
new file mode 100644
index 0000000..4629fe7
--- /dev/null
+++ b/common/src/main/java/rearth/oracle/util/MdxAttributes.java
@@ -0,0 +1,108 @@
+package rearth.oracle.util;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public record MdxAttributes(Map values, Set flags) {
+ public static final MdxAttributes EMPTY = new MdxAttributes(Map.of(), Set.of());
+
+ public record Match(MdxAttributes attributes, String remainder) {
+ }
+
+ public static MdxAttributes parse(String content) {
+ if (content == null || content.isBlank()) return EMPTY;
+
+ Map values = new HashMap<>();
+ Set flags = new HashSet<>();
+
+ for (var token : content.trim().split("\\s+")) {
+ if (token.isEmpty()) continue;
+
+ int separator = token.indexOf('=');
+ if (separator > 0) {
+ String key = token.substring(0, separator).trim().toLowerCase(Locale.ROOT);
+ String value = unwrap(token.substring(separator + 1).trim());
+ if (!key.isEmpty()) {
+ values.put(key, value);
+ }
+ } else if (token.startsWith("#") && token.length() > 1) {
+ values.put("id", token.substring(1));
+ } else {
+ flags.add(token.toLowerCase(Locale.ROOT));
+ }
+ }
+
+ return new MdxAttributes(values, flags);
+ }
+
+ @Nullable
+ public static Match matchLeading(String text) {
+ if (text == null || text.isEmpty() || text.charAt(0) != '{') return null;
+
+ int end = text.indexOf('}');
+ if (end < 0) return null;
+
+ return new Match(parse(text.substring(1, end)), text.substring(end + 1));
+ }
+
+ @Nullable
+ public static Match matchTrailing(@Nullable String text) {
+ if (text == null) return null;
+
+ String trimmed = text.stripTrailing();
+ if (!trimmed.endsWith("}")) return null;
+
+ int start = trimmed.lastIndexOf('{');
+ if (start < 0) return null;
+
+ String inside = trimmed.substring(start + 1, trimmed.length() - 1);
+ if (inside.indexOf('{') >= 0 || inside.indexOf('}') >= 0) return null;
+
+ return new Match(parse(inside), trimmed.substring(0, start).stripTrailing());
+ }
+
+ private static String unwrap(String value) {
+ if (value.length() >= 2) {
+ char first = value.charAt(0);
+ char last = value.charAt(value.length() - 1);
+ if (first == '"' && last == '"' || first == '\'' && last == '\'') {
+ return value.substring(1, value.length() - 1);
+ }
+ }
+
+ if (value.length() >= 2 && value.charAt(0) == '{' && value.charAt(value.length() - 1) == '}') {
+ return value.substring(1, value.length() - 1);
+ }
+
+ return value;
+ }
+
+ public boolean has(String flag) {
+ return flags.contains(flag);
+ }
+
+ @Nullable
+ public String get(String key) {
+ return values.get(key);
+ }
+
+ @Nullable
+ public Integer getPixels(String key) {
+ var raw = values.get(key);
+ if (raw == null) return null;
+
+ var cleaned = raw.trim().toLowerCase(Locale.ROOT);
+ if (cleaned.endsWith("px")) cleaned = cleaned.substring(0, cleaned.length() - 2);
+
+ try {
+ return Integer.parseInt(cleaned.trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ public boolean isEmpty() {
+ return values.isEmpty() && flags.isEmpty();
+ }
+}
diff --git a/common/src/main/java/rearth/oracle/util/MdxBlockFactory.java b/common/src/main/java/rearth/oracle/util/MdxBlockFactory.java
index 62a6e17..0d45968 100644
--- a/common/src/main/java/rearth/oracle/util/MdxBlockFactory.java
+++ b/common/src/main/java/rearth/oracle/util/MdxBlockFactory.java
@@ -6,11 +6,11 @@
import org.commonmark.parser.block.ParserState;
public class MdxBlockFactory extends AbstractBlockParserFactory {
-
+
@Override
public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
String line = state.getLine().getContent().toString().trim();
-
+
// leaf blocks
if (line.startsWith(" slots = new ArrayList<>();
public String result;
public int count = 1;
-
+
@Override
void parseContent() {
// regex is safer for the MDX array syntax than jsoup: slots={[ ... ]}
// matches content inside slots={[ ... ]}
var slotPattern = Pattern.compile("slots=\\{\\[(.*?)]}");
var slotMatcher = slotPattern.matcher(rawContent.replace("\n", " "));
-
+
if (slotMatcher.find()) {
var arrayContent = slotMatcher.group(1);
var items = arrayContent.split(",");
@@ -47,12 +48,12 @@ void parseContent() {
slots.add(item.trim().replace("'", "").replace("\"", ""));
}
}
-
+
// use jsoup for simple attributes like result="mod:item"
// strip the slots part to not confuse Jsoup
var safeHtml = rawContent.replaceAll("slots=\\{\\[.*?]}", "");
var el = Jsoup.parseBodyFragment(safeHtml).selectFirst("CraftingRecipe");
-
+
if (el != null) {
this.result = el.attr("result");
var countStr = el.attr("count").replaceAll("[{}]", "");
@@ -62,54 +63,60 @@ void parseContent() {
}
}
}
-
+
@Override
public String toString() {
return "CraftingRecipeBlock{" +
- "slots=" + slots +
- ", result='" + result + '\'' +
- ", count=" + count +
- ", rawContent='" + rawContent + '\'' +
- '}';
+ "slots=" + slots +
+ ", result='" + result + '\'' +
+ ", count=" + count +
+ ", rawContent='" + rawContent + '\'' +
+ '}';
}
}
-
+
public static class CalloutBlock extends MdxComponentBlock {
- public CalloutVariant variant = CalloutVariant.DEFAULT;
-
+ public CalloutVariant variant = CalloutVariant.NOTE;
+ @Nullable
+ public String title;
+ public boolean collapsible;
+ public boolean collapsed;
+
@Override
void parseContent() {
- var el = Jsoup.parseBodyFragment(rawContent).selectFirst("Callout");
- if (el != null) {
- if (el.hasAttr("variant")) {
- String name = el.attr("variant");
- try {
- this.variant = CalloutVariant.valueOf(name.toUpperCase(Locale.ROOT));
- } catch (IllegalArgumentException e) {
- LOGGER.error("Unknown callout variant: '{}'", name, e);
- }
- }
+ var el = element("Callout");
+ if (el == null) return;
+
+ var type = el.hasAttr("type") ? el.attr("type") : el.attr("variant");
+ this.variant = CalloutVariant.byName(type, CalloutVariant.NOTE);
+ if (el.hasAttr("title")) {
+ this.title = el.attr("title");
}
+ this.collapsed = el.hasAttr("collapsed");
+ this.collapsible = this.collapsed || el.hasAttr("collapsible");
}
-
+
@Override
public String toString() {
return "CalloutBlock{" +
- "variant='" + variant + '\'' +
- ", rawContent='" + rawContent + '\'' +
- '}';
+ "variant='" + variant + '\'' +
+ ", title='" + title + '\'' +
+ ", collapsible=" + collapsible +
+ ", collapsed=" + collapsed +
+ ", rawContent='" + rawContent + '\'' +
+ '}';
}
}
-
+
public static class AssetBlock extends MdxComponentBlock {
private final String tagName;
public String location;
public String width = "50%";
-
+
public AssetBlock(String tagName) {
this.tagName = tagName;
}
-
+
@Override
void parseContent() {
var el = Jsoup.parseBodyFragment(rawContent).selectFirst(tagName);
@@ -120,14 +127,61 @@ void parseContent() {
}
}
}
-
+
@Override
public String toString() {
return "AssetBlock{" +
- "location='" + location + '\'' +
- ", width='" + width + '\'' +
- ", rawContent='" + rawContent + '\'' +
- '}';
+ "location='" + location + '\'' +
+ ", width='" + width + '\'' +
+ ", rawContent='" + rawContent + '\'' +
+ '}';
+ }
+ }
+
+ public static class VideoEmbedBlock extends MdxComponentBlock {
+ public String videoId;
+
+ @Override
+ void parseContent() {
+ var el = element("VideoEmbed");
+ if (el != null) this.videoId = el.attr("id");
+ }
+
+ @Override
+ public String toString() {
+ return "VideoEmbedBlock{videoId='" + videoId + "'}";
+ }
+ }
+
+ public static class AudioBlock extends MdxComponentBlock {
+ public String src;
+
+ @Override
+ void parseContent() {
+ var el = element("Audio");
+ if (el == null) el = element("audio");
+ if (el != null) this.src = el.attr("src");
+ }
+
+ @Override
+ public String toString() {
+ return "AudioBlock{src='" + src + "'}";
+ }
+ }
+
+ public static class CodeTabsBlock extends MdxComponentBlock {
+ @Override
+ void parseContent() {
}
+
+ @Override
+ public String toString() {
+ return "CodeTabsBlock{}";
+ }
+ }
+
+ @Nullable
+ protected Element element(String tagName) {
+ return Jsoup.parseBodyFragment(rawContent).selectFirst(tagName);
}
}
diff --git a/common/src/main/resources/assets/oracle_index/lang/en_us.json b/common/src/main/resources/assets/oracle_index/lang/en_us.json
index 4d9a960..4a4179c 100644
--- a/common/src/main/resources/assets/oracle_index/lang/en_us.json
+++ b/common/src/main/resources/assets/oracle_index/lang/en_us.json
@@ -12,8 +12,10 @@
"oracle_index.button.docs": "Docs",
"oracle_index.button.content": "Content",
"oracle_index.tooltip.docs": "Hold [ALT] for Documentation",
- "oracle_index.callout.default": "Note",
- "oracle_index.callout.info": "Info",
+ "oracle_index.callout.note": "Note",
+ "oracle_index.callout.tip": "Tip",
+ "oracle_index.callout.important": "Important",
"oracle_index.callout.warning": "Warning",
- "oracle_index.callout.danger": "Danger"
+ "oracle_index.callout.caution": "Caution",
+ "oracle_index.video.watch": "Watch on YouTube"
}
diff --git a/common/src/main/resources/assets/oracle_index/textures/gui/bedrock_panel_important.png b/common/src/main/resources/assets/oracle_index/textures/gui/bedrock_panel_important.png
new file mode 100644
index 0000000..2a0f78b
Binary files /dev/null and b/common/src/main/resources/assets/oracle_index/textures/gui/bedrock_panel_important.png differ
diff --git a/common/src/main/resources/oracle_index.accesswidener b/common/src/main/resources/oracle_index.accesswidener
index 8fa4e7f..c422024 100644
--- a/common/src/main/resources/oracle_index.accesswidener
+++ b/common/src/main/resources/oracle_index.accesswidener
@@ -1,3 +1,6 @@
accessWidener v2 official
accessible field net/minecraft/client/multiplayer/ClientAdvancements progress Ljava/util/Map;
+accessible field net/minecraft/client/sounds/SoundManager soundCache Ljava/util/Map;
+accessible field net/minecraft/client/sounds/SoundManager soundEngine Lnet/minecraft/client/sounds/SoundEngine;
+accessible field net/minecraft/client/sounds/SoundEngine instanceToChannel Ljava/util/Map;
diff --git a/common/src/testmod/resources/assets/oracle_index/books/oracle-index-test/docs/introduction.mdx b/common/src/testmod/resources/assets/oracle_index/books/oracle-index-test/docs/introduction.mdx
index 1a1f8db..8a86805 100644
--- a/common/src/testmod/resources/assets/oracle_index/books/oracle-index-test/docs/introduction.mdx
+++ b/common/src/testmod/resources/assets/oracle_index/books/oracle-index-test/docs/introduction.mdx
@@ -10,6 +10,73 @@ Green Apple by ref default title: [](+my_green_apple).
Vanilla link: [](@minecraft:apple)
+## Tables
+
+| Some table | One | Two | Three | Four |
+|-------------|-----|-----|-------|------|
+| First value | Yes | ❌ | 1 | 4 |
+| Lorem ipsum | No | ✅ | 2 | 5 |
+| Foo bar | Yes | 🟢 | 3 | 6 |
+
+## Markdown sugar
+
+### Block quote
+
+> Example block quote text.
+> Lorem ipsum dolor sit amet.
+
+### Assets
+
+
+
+
+
+### GitHub-style Alert
+
+> [!NOTE]
+> Useful information that users should know, even when skimming content.
+
+> [!TIP]
+> Helpful advice for doing things better or more easily.
+
+> [!IMPORTANT]
+> Key information users need to know to achieve their goal.
+
+> [!WARNING]
+> Urgent info that needs immediate user attention to avoid problems.
+
+> [!CAUTION]
+> Advises about risks or negative outcomes of certain actions.
+
+#### Collapsible
+
+> [!TIP] Pro tip
+> A callout with a custom title.
+
+> [!WARNING]+
+> A collapsible callout, expanded by default.
+
+> [!CAUTION]- At your own risk
+> A collapsible callout with a custom title, collapsed by default.
+
+### Hover text
+
+A pickaxe is required to ?[mine](break while also dropping an item) this block.
+
+### Figures
+
+
+
+### Image attributes
+
+{center width=100}
+
+{item}
+
+## Heading attributes {clear #attrs}
+
+{right}
+
## Components
### `Asset`
@@ -36,6 +103,15 @@ Vanilla link: [](@minecraft:apple)
}
```
+
+```
+function noLanguage(ipsum, dolor = 1) {
+ const sit = ipsum == null ? 0 : ipsum.sit
+ dolor = sit - amet(dolor)
+ return sit ? consectetur(ipsum) : []
+}
+```
+
### `Callout`
@@ -46,6 +122,10 @@ Vanilla link: [](@minecraft:apple)
This is a sample info callout
+
+ This is a sample important callout
+
+
This is a sample warning callout
@@ -54,6 +134,16 @@ Vanilla link: [](@minecraft:apple)
This is a sample danger callout
|