fix: invalid link parser safety (#367)

klikli-dev · web-flow · commit 524156ef2f88 · 2026-05-27T20:34:03.000+02:00
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/api/ModonomiconConstants.java b/common/src/main/java/com/klikli_dev/modonomicon/api/ModonomiconConstants.java
@@ -68,6 +68,7 @@ public static class Gui {
             public static final String HOVER_BOOK_LINK = PREFIX + "hover.book_link";
             public static final String HOVER_BOOK_LINK_ERROR = PREFIX + "hover.book_link.error";
             public static final String HOVER_BOOK_LINK_LOCKED = PREFIX + "hover.book_link_locked";
+            public static final String HOVER_LINK_ERROR = PREFIX + "hover.link.error";
             public static final String HOVER_BOOK_ENTRY_LINK_LOCKED_INFO = PREFIX + "hover.book_entry_link_locked_info";
             public static final String HOVER_BOOK_ENTRY_LINK_LOCKED_INFO_HINT = PREFIX + "hover.book_entry_link_locked_info.hint";
             public static final String HOVER_BOOK_PAGE_LINK_LOCKED_INFO = PREFIX + "hover.book_page_link_locked_info";
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/BookTextHolder.java b/common/src/main/java/com/klikli_dev/modonomicon/book/BookTextHolder.java
@@ -8,10 +8,10 @@
 
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.chat.contents.TranslatableContents;
@@ -21,7 +21,7 @@ public class BookTextHolder {
 
     public static final BookTextHolder EMPTY = new BookTextHolder("");
     public static final Codec<BookTextHolder> CODEC = Codec.either(Codec.STRING, ComponentSerialization.CODEC)
-            .xmap(value -> value.map(BookTextHolder::new, BookTextHolder::new), holder -> holder.hasComponent() ? Either.right(holder.component) : Either.left(holder.string));
+            .xmap(value -> value.map(BookTextHolder::new, BookTextHolder::new), BookTextHolder::toSerializableValue);
     public static final StreamCodec<RegistryFriendlyByteBuf, BookTextHolder> STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(CODEC);
 
     private Component component;
@@ -73,6 +73,10 @@ public void toNetwork(RegistryFriendlyByteBuf buffer) {
         STREAM_CODEC.encode(buffer, this);
     }
 
+    protected Either<String, Component> toSerializableValue() {
+        return this.hasComponent() ? Either.right(this.component) : Either.left(this.string);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/RenderedBookTextHolder.java b/common/src/main/java/com/klikli_dev/modonomicon/book/RenderedBookTextHolder.java
@@ -6,6 +6,7 @@
 
 package com.klikli_dev.modonomicon.book;
 
+import com.mojang.datafixers.util.Either;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -18,6 +19,12 @@ public class RenderedBookTextHolder extends BookTextHolder {
     private final List<MutableComponent> renderedText;
 
     public RenderedBookTextHolder(BookTextHolder original, List<MutableComponent> renderedText) {
+        if (original == null) {
+            throw new IllegalArgumentException("original cannot be null");
+        }
+        if (renderedText == null) {
+            throw new IllegalArgumentException("renderedText cannot be null");
+        }
         this.original = original;
         this.renderedText = renderedText;
     }
@@ -50,4 +57,9 @@ public boolean hasComponent() {
     public void toNetwork(RegistryFriendlyByteBuf buffer) {
         this.original.toNetwork(buffer);
     }
+
+    @Override
+    protected Either<String, Component> toSerializableValue() {
+        return this.original.toSerializableValue();
+    }
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorHolder.java b/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorHolder.java
@@ -20,4 +20,12 @@ public void addError(BookErrorInfo error) {
     public List<BookErrorInfo> getErrors() {
         return this.errors;
     }
+
+    public boolean hasBlockingErrors() {
+        return this.errors.stream().anyMatch(BookErrorInfo::blocksOpening);
+    }
+
+    public BookErrorInfo getFirstBlockingError() {
+        return this.errors.stream().filter(BookErrorInfo::blocksOpening).findFirst().orElse(null);
+    }
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorInfo.java b/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorInfo.java
@@ -10,11 +10,21 @@ public class BookErrorInfo {
     private final String errorMessage;
     private final Exception exception;
     private final String context;
+    private final boolean blocksOpening;
 
     public BookErrorInfo(String errorMessage, Exception exception, String context) {
+        this(errorMessage, exception, context, true);
+    }
+
+    public BookErrorInfo(String errorMessage, Exception exception, String context, boolean blocksOpening) {
         this.errorMessage = errorMessage;
         this.exception = exception;
         this.context = context;
+        this.blocksOpening = blocksOpening;
+    }
+
+    public boolean blocksOpening() {
+        return this.blocksOpening;
     }
 
     @Override
@@ -26,6 +36,7 @@ public String toString() {
                 "\nerrorMessage='" + errorMessage + "'" +
                 ", \ncontext='" + context + "'" +
                 ", \nexception='" + exception + "'" +
+                ", \nblocksOpening='" + this.blocksOpening + "'" +
                 "\n}";
     }
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorManager.java b/common/src/main/java/com/klikli_dev/modonomicon/book/error/BookErrorManager.java
@@ -52,6 +52,11 @@ public boolean hasErrors(Identifier book) {
         return holder != null && !holder.getErrors().isEmpty();
     }
 
+    public boolean hasBlockingErrors(Identifier book) {
+        var holder = this.booksErrors.get(book);
+        return holder != null && holder.hasBlockingErrors();
+    }
+
     public void error(String message) {
         this.error(new BookErrorInfo(message, null, this.currentContext));
     }
@@ -60,6 +65,10 @@ public void error(String message, Exception exception) {
         this.error(new BookErrorInfo(message, exception, this.currentContext));
     }
 
+    public void error(String message, Exception exception, boolean blocksOpening) {
+        this.error(new BookErrorInfo(message, exception, this.currentContext, blocksOpening));
+    }
+
     public void error(BookErrorInfo error) {
         this.error(this.currentBookId, error);
     }
@@ -72,6 +81,10 @@ public void error(Identifier book, String message, Exception exception) {
         this.error(book, new BookErrorInfo(message, exception, this.currentContext));
     }
 
+    public void error(Identifier book, String message, Exception exception, boolean blocksOpening) {
+        this.error(book, new BookErrorInfo(message, exception, this.currentContext, blocksOpening));
+    }
+
     public void error(Identifier book, BookErrorInfo error) {
         if (book == null) {
             Modonomicon.LOG.error("BookErrorManager.error() called with null book id with error: {}", error);
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/BookGuiManager.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/BookGuiManager.java
@@ -72,7 +72,7 @@ public static BookGuiManager get() {
     }
 
     protected boolean showErrorScreen(Identifier bookId) {
-        if (BookErrorManager.get().hasErrors(bookId)) {
+        if (BookErrorManager.get().hasBlockingErrors(bookId)) {
             var book = BookDataManager.get().getBook(bookId);
             Minecraft.getInstance().setScreen(new BookErrorScreen(book));
             return true;
@@ -425,6 +425,7 @@ public void openEntry(Identifier bookId, @Nullable Identifier categoryId, @Nulla
         }
 
         if (this.showErrorScreen(bookId)) {
+            return;
         }
 
         this.keepMousePosition(() -> {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookErrorScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookErrorScreen.java
@@ -38,7 +38,7 @@ public void renderBookBackground(GuiGraphicsExtractor guiGraphics) {
 
     public void renderError(GuiGraphicsExtractor guiGraphics, Component text, int x, int y, int width) {
         for (FormattedCharSequence formattedcharsequence : this.font.split(text, width)) {
-            guiGraphics.text(this.font, formattedcharsequence, x, y, 1, false);
+            guiGraphics.text(this.font, formattedcharsequence, x, y, 0xFF000000, false);
             y += this.font.lineHeight;
         }
     }
@@ -49,7 +49,10 @@ public void prepareError() {
             this.errorText = Component.translatable(Gui.NO_ERRORS_FOUND);
             Modonomicon.LOG.warn("No errors found for book {}, but error screen was opened!", this.book.getId());
         } else {
-            var firstError = errorHolder.getErrors().get(0);
+            var firstError = errorHolder.getFirstBlockingError();
+            if (firstError == null) {
+                firstError = errorHolder.getErrors().get(0);
+            }
 
             var errorString = firstError.toString();
             if (errorHolder.getErrors().size() > 1) {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/BookLinkRenderer.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/BookLinkRenderer.java
@@ -6,7 +6,6 @@
 
 package com.klikli_dev.modonomicon.client.gui.book.markdown;
 
-import com.klikli_dev.modonomicon.Modonomicon;
 import com.klikli_dev.modonomicon.api.ModonomiconConstants.I18n.Gui;
 import com.klikli_dev.modonomicon.book.BookLink;
 import com.klikli_dev.modonomicon.book.error.BookErrorManager;
@@ -31,7 +30,6 @@ public boolean visit(Link link, Consumer<Node> visitChildren, ComponentNodeRende
                     link.getDestination(),
                     BookErrorManager.get().getContextHelper()
             );
-
             try {
                 var bookLink = BookLink.from(context.getBook(), link.getDestination());
                 var book = BookDataManager.get().getBook(bookLink.bookId);
@@ -63,34 +61,10 @@ public boolean visit(Link link, Consumer<Node> visitChildren, ComponentNodeRende
                         .withClickEvent(null)
                         .withHoverEvent(null)
                 );
-            } catch (Exception e) {
-                if (context.getBook().allowOpenBooksWithInvalidLinks()) {
-                    Modonomicon.LOG.error("Failed to parse book link. allowOpenBooksWithInvalidLinks = true, so book parsing continues. Original error:", e);
-
-                    //Render error message as tooltip in red
-                    var hoverComponent = Component.translatable(Gui.HOVER_BOOK_LINK_ERROR, link.getDestination()).withStyle(ChatFormatting.RED);
-
-                    //Render link in red
-                    context.setCurrentStyle(context.getCurrentStyle()
-                            .withColor(ChatFormatting.RED)
-                            .withHoverEvent(new HoverEvent.ShowText(hoverComponent))
-                    );
-
-                    visitChildren.accept(link);
-
-                    //links are not style instructions, so we reset to our previous color.
-                    context.setCurrentStyle(context.getCurrentStyle()
-                            .withColor(currentColor)
-                            .withClickEvent(null)
-                            .withHoverEvent(null)
-                    );
-                } else {
-                    throw e;
-                }
+                return true;
+            } finally {
+                BookErrorManager.get().setContext(null);
             }
-
-            BookErrorManager.get().setContext(null);
-            return true;
         }
         return false;
 
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/CoreComponentNodeRenderer.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/CoreComponentNodeRenderer.java
@@ -6,10 +6,13 @@
 
 package com.klikli_dev.modonomicon.client.gui.book.markdown;
 
+import com.klikli_dev.modonomicon.Modonomicon;
 import com.klikli_dev.modonomicon.api.ModonomiconConstants.I18n.Gui;
+import com.klikli_dev.modonomicon.book.error.BookErrorManager;
 import com.klikli_dev.modonomicon.client.gui.book.markdown.internal.renderer.BulletListHolder;
 import com.klikli_dev.modonomicon.client.gui.book.markdown.internal.renderer.OrderedListHolder;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.ClickEvent.Action;
 import net.minecraft.network.chat.Component;
@@ -101,25 +104,52 @@ public void visit(HardLineBreak hardLineBreak) {
 
     @Override
     public void visit(Link link) {
-        for (var renderer : this.context.getLinkRenderers()) {
-            if (renderer.visit(link, this::visitChildren, this.context)) {
-                return;
+        try {
+            for (var renderer : this.context.getLinkRenderers()) {
+                if (renderer.visit(link, this::visitChildren, this.context)) {
+                    return;
+                }
             }
+
+            //if no link renderer, we just do a http link
+            var currentColor = this.context.getCurrentStyle().getColor();
+            var hoverComponent = Component.translatable(Gui.HOVER_HTTP_LINK, link.getDestination());
+            //if we have a color we use it, otherwise we use link default.
+            this.context.setCurrentStyle(this.context.getCurrentStyle()
+                    .withColor(currentColor == null ? this.context.getLinkColor() : currentColor)
+                    .withClickEvent(new ClickEvent.OpenUrl(URI.create(link.getDestination())))
+                    .withHoverEvent(new HoverEvent.ShowText(hoverComponent))
+            );
+
+            this.visitChildren(link);
+
+            //at the end of the link we reset to our previous color.
+            this.context.setCurrentStyle(this.context.getCurrentStyle()
+                    .withColor(currentColor)
+                    .withClickEvent(null)
+                    .withHoverEvent(null)
+            );
+        } catch (Exception e) {
+            this.renderBrokenLink(link, e);
         }
+    }
+
+    private void renderBrokenLink(Link link, Exception exception) {
+        var blocksOpening = !this.context.getBook().allowOpenBooksWithInvalidLinks();
+        BookErrorManager.get().error("Failed to parse markdown link '" + link.getDestination() + "'", exception, blocksOpening);
+        Modonomicon.LOG.error("Failed to parse markdown link. allowOpenBooksWithInvalidLinks = {}, blocksOpening = {}. Original error:",
+                this.context.getBook().allowOpenBooksWithInvalidLinks(), blocksOpening, exception);
 
-        //if no link renderer, we just do a http link
         var currentColor = this.context.getCurrentStyle().getColor();
-        var hoverComponent = Component.translatable(Gui.HOVER_HTTP_LINK, link.getDestination());
-        //if we have a color we use it, otherwise we use link default.
+        var hoverComponent = Component.translatable(Gui.HOVER_LINK_ERROR, link.getDestination()).withStyle(ChatFormatting.RED);
         this.context.setCurrentStyle(this.context.getCurrentStyle()
-                .withColor(currentColor == null ? this.context.getLinkColor() : currentColor)
-                .withClickEvent(new ClickEvent.OpenUrl(URI.create(link.getDestination())))
+                .withColor(ChatFormatting.RED)
+                .withClickEvent(null)
                 .withHoverEvent(new HoverEvent.ShowText(hoverComponent))
         );
 
         this.visitChildren(link);
 
-        //at the end of the link we reset to our previous color.
         this.context.setCurrentStyle(this.context.getCurrentStyle()
                 .withColor(currentColor)
                 .withClickEvent(null)
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/ItemLinkRenderer.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/markdown/ItemLinkRenderer.java
@@ -8,6 +8,7 @@
 
 import com.klikli_dev.modonomicon.book.error.BookErrorManager;
 import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.item.ItemInput;
 import net.minecraft.commands.arguments.item.ItemParser;
 import net.minecraft.network.chat.ClickEvent;
@@ -51,15 +52,15 @@ public boolean visit(Link link, Consumer<Node> visitChildren, ComponentNodeRende
 
 
             var itemParser = new ItemParser(context.getProvider());
-            var itemStack = ItemStack.EMPTY;
+            var itemId = link.getDestination().substring(PROTOCOL_ITEM_LENGTH);
+            var reader = new StringReader(itemId);
+            ItemStack itemStack;
             try {
-                var itemId = link.getDestination().substring(PROTOCOL_ITEM_LENGTH);
-                var reader = new StringReader(itemId);
                 var itemResult = itemParser.parse(reader);
                 var itemInput = new ItemInput(itemResult.item(), itemResult.components());
                 itemStack = itemInput.createItemStack(1);
-            } catch (Exception e) {
-                BookErrorManager.get().error("Failed to parse item link.", e);
+            } catch (CommandSyntaxException e) {
+                throw new RuntimeException(e);
             }
 
 
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/data/BookDataManager.java b/common/src/main/java/com/klikli_dev/modonomicon/data/BookDataManager.java
@@ -191,7 +191,7 @@ public void prerenderMarkdown(Collection<Book> books, HolderLookup.Provider prov
             //TODO: allow modders to configure this renderer
             var textRenderer = new BookTextRenderer(book, provider);
 
-            if (!BookErrorManager.get().hasErrors(book.getId())) {
+            if (!BookErrorManager.get().hasBlockingErrors(book.getId())) {
                 try {
                     book.prerenderMarkdown(textRenderer);
                 } catch (Exception e) {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/datagen/EnUsProvider.java b/common/src/main/java/com/klikli_dev/modonomicon/datagen/EnUsProvider.java
@@ -40,6 +40,7 @@ private void addMisc() {
 
         this.add(Gui.HOVER_BOOK_LINK, "Go to: %s");
         this.add(Gui.HOVER_BOOK_LINK_ERROR, "Invalid link: %s. Please contact the author of the book or the translator to fix this. More information can be found in the log with the context \"Failed to parse book link.\".");
+        this.add(Gui.HOVER_LINK_ERROR, "Invalid link: %s. Please contact the author of the book or the translator to fix this. More information can be found in the log.");
         this.add(Gui.HOVER_BOOK_LINK_LOCKED, "%s.\n%s");
         this.add(Gui.HOVER_BOOK_ENTRY_LINK_LOCKED_INFO, "You need to unlock this entry before you can open the link!");
         this.add(Gui.HOVER_BOOK_ENTRY_LINK_LOCKED_INFO_HINT, "Hint: The entry is in the Category: %s");
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/datagen/book/demo/formatting/LinkFormattingEntry.java b/common/src/main/java/com/klikli_dev/modonomicon/datagen/book/demo/formatting/LinkFormattingEntry.java
@@ -69,15 +69,15 @@ protected void generatePages() {
 //        );
 
 
-        this.page("invalidLink", () -> BookTextPageModel.create()
+        this.page("invalid_link", () -> BookTextPageModel.create()
                 .withTitle(this.context().pageTitle())
                 .withText(this.context().pageText())
         );
         this.pageTitle("Invalid Link");
         this.pageText("""
                 {0}
                 """,
-                this.entryLink("It has an invalid Link", "a_cat", "an_entry")
+                this.entryLink("This is an invalid link.", "a_cat", "an_entry")
         );
     }
 
diff --git a/fabric/src/generated/resources/assets/modonomicon/lang/en_us.json b/fabric/src/generated/resources/assets/modonomicon/lang/en_us.json
@@ -104,8 +104,8 @@
   "book.modonomicon.demo.formatting.basic.page1.title": "Basic Formatting",
   "book.modonomicon.demo.formatting.basic.page2.text": "~~This is stricken through~~    \n[#](55FF55)Colorful Text![#]()\n",
   "book.modonomicon.demo.formatting.link.description": "An entry showcasing link formatting.",
-  "book.modonomicon.demo.formatting.link.invalidLink.text": "[It has an invalid Link](entry://modonomicon:demo/a_cat/an_entry)\n",
-  "book.modonomicon.demo.formatting.link.invalidLink.title": "Invalid Link",
+  "book.modonomicon.demo.formatting.link.invalid_link.text": "[This is an invalid link.](entry://modonomicon:demo/a_cat/an_entry)\n",
+  "book.modonomicon.demo.formatting.link.invalid_link.title": "Invalid Link",
   "book.modonomicon.demo.formatting.link.name": "Link Formatting Entry",
   "book.modonomicon.demo.formatting.link.page1.text": "[Click me!](https://klikli-dev.github.io/modonomicon/) \\\n[Or me!](https://github.com/klikli-dev/modonomicon)\n",
   "book.modonomicon.demo.formatting.link.page1.title": "Http Links",
@@ -203,6 +203,7 @@
   "modonomicon.gui.hover.item_link_info": "Click to show recipe in JEI, Shift-Click to show usage.",
   "modonomicon.gui.hover.item_link_info.no_jei": "Install JEI to show recipe/usage on click.",
   "modonomicon.gui.hover.item_link_info_line2": "Will not do anything, if no recipe/usage is found.",
+  "modonomicon.gui.hover.link.error": "Invalid link: %s. Please contact the author of the book or the translator to fix this. More information can be found in the log.",
   "modonomicon.gui.no_errors_found": "No errors found. You should not see this page!",
   "modonomicon.gui.open_bookmarks": "Open Bookmarks",
   "modonomicon.gui.open_recently_unlocked": "Recently Unlocked",
diff --git a/fabric/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalidLink.json b/fabric/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalidLink.json
diff --git a/fabric/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalid_link.json b/fabric/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalid_link.json
diff --git a/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d b/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d
diff --git a/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
diff --git a/neo/src/generated/resources/assets/modonomicon/lang/en_us.json b/neo/src/generated/resources/assets/modonomicon/lang/en_us.json
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalidLink.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalidLink.json
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalid_link.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link/pages/invalid_link.json

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,12 @@ public void addError(BookErrorInfo error) {`
`20`	`20`	`public List<BookErrorInfo> getErrors() {`
`21`	`21`	`return this.errors;`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ public boolean hasBlockingErrors() {`
	`25`	`+ return this.errors.stream().anyMatch(BookErrorInfo::blocksOpening);`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ public BookErrorInfo getFirstBlockingError() {`
	`29`	`+ return this.errors.stream().filter(BookErrorInfo::blocksOpening).findFirst().orElse(null);`
	`30`	`+ }`
`23`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ public boolean hasErrors(Identifier book) {`
`52`	`52`	`return holder != null && !holder.getErrors().isEmpty();`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ public boolean hasBlockingErrors(Identifier book) {`
	`56`	`+ var holder = this.booksErrors.get(book);`
	`57`	`+ return holder != null && holder.hasBlockingErrors();`
	`58`	`+ }`
	`59`	`+`
`55`	`60`	`public void error(String message) {`
`56`	`61`	`this.error(new BookErrorInfo(message, null, this.currentContext));`
`57`	`62`	`}`
`@@ -60,6 +65,10 @@ public void error(String message, Exception exception) {`
`60`	`65`	`this.error(new BookErrorInfo(message, exception, this.currentContext));`
`61`	`66`	`}`
`62`	`67`
	`68`	`+ public void error(String message, Exception exception, boolean blocksOpening) {`
	`69`	`+ this.error(new BookErrorInfo(message, exception, this.currentContext, blocksOpening));`
	`70`	`+ }`
	`71`	`+`
`63`	`72`	`public void error(BookErrorInfo error) {`
`64`	`73`	`this.error(this.currentBookId, error);`
`65`	`74`	`}`
`@@ -72,6 +81,10 @@ public void error(Identifier book, String message, Exception exception) {`
`72`	`81`	`this.error(book, new BookErrorInfo(message, exception, this.currentContext));`
`73`	`82`	`}`
`74`	`83`
	`84`	`+ public void error(Identifier book, String message, Exception exception, boolean blocksOpening) {`
	`85`	`+ this.error(book, new BookErrorInfo(message, exception, this.currentContext, blocksOpening));`
	`86`	`+ }`
	`87`	`+`
`75`	`88`	`public void error(Identifier book, BookErrorInfo error) {`
`76`	`89`	`if (book == null) {`
`77`	`90`	`Modonomicon.LOG.error("BookErrorManager.error() called with null book id with error: {}", error);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static BookGuiManager get() {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`protected boolean showErrorScreen(Identifier bookId) {`
`75`		`- if (BookErrorManager.get().hasErrors(bookId)) {`
	`75`	`+ if (BookErrorManager.get().hasBlockingErrors(bookId)) {`
`76`	`76`	`var book = BookDataManager.get().getBook(bookId);`
`77`	`77`	`Minecraft.getInstance().setScreen(new BookErrorScreen(book));`
`78`	`78`	`return true;`
`@@ -425,6 +425,7 @@ public void openEntry(Identifier bookId, @Nullable Identifier categoryId, @Nulla`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`if (this.showErrorScreen(bookId)) {`
	`428`	`+ return;`
`428`	`429`	`}`
`429`	`430`
`430`	`431`	`this.keepMousePosition(() -> {`