From 872da1c0fd4eed05bac688618a66cfaa86b533aa Mon Sep 17 00:00:00 2001
From: Kli Kli <klikli@outlook.at>
Date: Mon, 17 Jun 2024 13:43:16 +0200
Subject: [PATCH] feat: Bookmarks (#219)

* feat: add bookmark storage and bookmark access helpers

* feat: add bookmark screen

* feat: add buttons for bookmark system

* feat: add show category button to index screens

* feat: add add/remove bookmark buttons

Also update some map init code and use fastutil maps more extensively

* fix: neo network packet registration (play direction)

* fix: crash

* fix: locked entries are clickable
---
 .../modonomicon/api/ModonomiconConstants.java |   7 +
 .../AbstractModonomiconLanguageProvider.java  |   3 +-
 .../api/datagen/ModonomiconProviderBase.java  |   2 +-
 .../com/klikli_dev/modonomicon/book/Book.java |   2 +-
 .../bookstate/BookUnlockStates.java           |   7 +-
 .../bookstate/BookVisualStateManager.java     |  23 ++
 .../bookstate/BookVisualStates.java           |  21 +-
 .../client/gui/BookGuiManager.java            |   4 -
 .../client/gui/book/BookAddress.java          |   9 +-
 .../client/gui/book/BookParentScreen.java     |   2 +-
 .../book/bookmarks/BookBookmarksScreen.java   | 269 ++++++++++++++++++
 .../gui/book/button/AddBookmarkButton.java    |  66 +++++
 .../gui/book/button/EntryListButton.java      |  14 +-
 .../gui/book/button/RemoveBookmarkButton.java |  65 +++++
 .../gui/book/button/ShowBookmarksButton.java  |  64 +++++
 .../book/entry/BookEntryDoublePageScreen.java |   5 +
 .../gui/book/entry/BookEntryScreen.java       |  73 +++++
 .../book/entry/BookEntrySinglePageScreen.java |   8 +-
 .../gui/book/index/BookParentIndexScreen.java |  18 +-
 .../gui/book/node/BookParentNodeScreen.java   |  18 +-
 .../render/page/PageRendererRegistry.java     |  11 +-
 .../modonomicon/data/LoaderRegistry.java      |  25 +-
 .../modonomicon/datagen/EnUsProvider.java     |  17 ++
 .../networking/AddBookmarkMessage.java        |  52 ++++
 .../networking/RemoveBookmarkMessage.java     |  48 ++++
 .../SyncBookUnlockStatesMessage.java          |   8 +-
 .../SyncBookVisualStatesMessage.java          |  12 +-
 .../textures/gui/book_overview.png            | Bin 5829 -> 1578 bytes
 .../modonomicon/network/Networking.java       |   4 +
 .../modonomicon/network/Networking.java       |  12 +
 .../c622617f6fabf890a00b9275cd5f643584a8a2c8  |   4 +-
 .../assets/modonomicon/lang/en_us.json        |   7 +
 .../modonomicon/network/Networking.java       |   6 +-
 33 files changed, 840 insertions(+), 46 deletions(-)
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/bookmarks/BookBookmarksScreen.java
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/AddBookmarkButton.java
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/RemoveBookmarkButton.java
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/ShowBookmarksButton.java
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/networking/AddBookmarkMessage.java
 create mode 100644 common/src/main/java/com/klikli_dev/modonomicon/networking/RemoveBookmarkMessage.java

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
index 75c1dea75..19adaf67c 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/api/ModonomiconConstants.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/api/ModonomiconConstants.java
@@ -153,8 +153,15 @@ public static class Gui {
             public static final String BOOK_INDEX_LIST_TITLE = PREFIX + "book.index_list_title";
             public static final String CATEGORY_INDEX_LIST_TITLE = PREFIX + "category.index_list_title";
 
+            public static final String BOOKMARKS_SCREEN_TITLE = PREFIX + "bookmarks.screen.title";
+            public static final String BOOKMARKS_INFO_TEXT = PREFIX + "bookmarks.info";
+            public static final String BOOKMARKS_ENTRY_LIST_TITLE = PREFIX + "bookmarks.entry_list_title";
+            public static final String BOOKMARKS_NO_RESULTS = PREFIX + "bookmarks.no_results";
 
             public static final String OPEN_SEARCH = PREFIX + "open_search";
+            public static final String OPEN_BOOKMARKS = PREFIX + "open_bookmarks";
+            public static final String ADD_BOOKMARK = PREFIX + "add_bookmark";
+            public static final String REMOVE_BOOKMARK = PREFIX + "remove_bookmark";
 
             public static final String RECIPE_PAGE_RECIPE_MISSING = PREFIX + "recipe_page.recipe_missing";
         }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/AbstractModonomiconLanguageProvider.java b/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/AbstractModonomiconLanguageProvider.java
index 92512f669..c3c386125 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/AbstractModonomiconLanguageProvider.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/AbstractModonomiconLanguageProvider.java
@@ -5,6 +5,7 @@
 package com.klikli_dev.modonomicon.api.datagen;
 
 import com.google.gson.JsonObject;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
@@ -23,7 +24,7 @@
 import java.util.function.Supplier;
 
 public abstract class AbstractModonomiconLanguageProvider implements ModonomiconLanguageProvider, DataProvider {
-    private final Map<String, String> data = new TreeMap<>();
+    private final Map<String, String> data = new Object2ObjectOpenHashMap<>();
     private final PackOutput output;
     private final String modid;
     private final String locale;
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/ModonomiconProviderBase.java b/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/ModonomiconProviderBase.java
index e15fe5863..fdc743ba2 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/ModonomiconProviderBase.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/api/datagen/ModonomiconProviderBase.java
@@ -43,7 +43,7 @@ public abstract class ModonomiconProviderBase {
     protected final Map<String, ModonomiconLanguageProvider> translations;
     protected final BookContextHelper context;
     protected final ConditionHelper conditionHelper;
-    private Map<String, String> macros = new Object2ObjectOpenHashMap<>();
+    private final Map<String, String> macros = new Object2ObjectOpenHashMap<>();
 
     protected ModonomiconProviderBase(String modId, ModonomiconLanguageProvider lang, Map<String, ModonomiconLanguageProvider> translations, BookContextHelper context, ConditionHelper conditionHelper) {
         this.modId = modId;
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/Book.java b/common/src/main/java/com/klikli_dev/modonomicon/book/Book.java
index 507303802..7b8a176b1 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/book/Book.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/book/Book.java
@@ -516,7 +516,7 @@ public boolean isLeaflet() {
 
     public BookAddress getLeafletAddress() {
         var leafletEntry = this.getEntry(this.leafletEntry);
-        return BookAddress.ignoreSavedAndOpen(leafletEntry);
+        return BookAddress.ignoreSaved(leafletEntry);
     }
 
     public PageDisplayMode getPageDisplayMode() {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookUnlockStates.java b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookUnlockStates.java
index f255cac54..28c128216 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookUnlockStates.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookUnlockStates.java
@@ -90,8 +90,11 @@ public BookUnlockStates(Map<ResourceLocation, Set<ResourceLocation>> readEntries
             entryPagesMap.forEach((entryId, pages) -> innerMap.put(entryId, new ObjectOpenHashSet<>(pages)));
         });
 
-        this.unlockedEntries = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>(unlockedEntries));
-        this.unlockedCategories = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>(unlockedCategories));
+        this.unlockedEntries = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+        unlockedEntries.forEach((bookId, entries) -> this.unlockedEntries.put(bookId, new ObjectOpenHashSet<>(entries)));
+
+        this.unlockedCategories = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+        unlockedCategories.forEach((bookId, categories) -> this.unlockedCategories.put(bookId, new ObjectOpenHashSet<>(categories)));
 
         this.usedCommands = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
         usedCommands.forEach((bookId, commandUsesMap) -> {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStateManager.java b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStateManager.java
index af97ea135..4d67a7ec6 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStateManager.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStateManager.java
@@ -13,6 +13,7 @@
 import com.klikli_dev.modonomicon.bookstate.visual.BookVisualState;
 import com.klikli_dev.modonomicon.bookstate.visual.CategoryVisualState;
 import com.klikli_dev.modonomicon.bookstate.visual.EntryVisualState;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
 import com.klikli_dev.modonomicon.networking.RequestSyncBookStatesMessage;
 import com.klikli_dev.modonomicon.networking.SyncBookVisualStatesMessage;
 import com.klikli_dev.modonomicon.platform.Services;
@@ -21,6 +22,8 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.saveddata.SavedData;
 
+import java.util.List;
+
 public class BookVisualStateManager {
 
     private static final BookVisualStateManager instance = new BookVisualStateManager();
@@ -47,6 +50,10 @@ public EntryVisualState getEntryStateFor(Player player, BookEntry entry) {
         return this.getStateFor(player).getEntryState(entry);
     }
 
+    public List<BookAddress> getBookmarksFor(Player player, Book book) {
+        return this.getStateFor(player).getBookmarks(book);
+    }
+
     public void setEntryStateFor(ServerPlayer player, BookEntry entry, EntryVisualState state) {
         this.getStateFor(player).setEntryState(entry, state);
         this.saveData.setDirty();
@@ -62,6 +69,22 @@ public void setBookStateFor(ServerPlayer player, Book book, BookVisualState stat
         this.saveData.setDirty();
     }
 
+    public void setBookmarksFor(ServerPlayer player, Book book, List<BookAddress> bookmarks) {
+        this.getStateFor(player).setBookmarks(book, bookmarks);
+        this.saveData.setDirty();
+    }
+
+    public void addBookmarkFor(Player player, Book book, BookAddress bookmark) {
+        this.getStateFor(player).addBookmark(book, bookmark);
+        this.saveData.setDirty();
+    }
+
+    public boolean removeBookmarkFor(Player player, Book book, BookAddress bookmark) {
+        var result = this.getStateFor(player).removeBookmark(book, bookmark);
+        this.saveData.setDirty();
+        return result;
+    }
+
     public void syncFor(ServerPlayer player) {
         Services.NETWORK.sendTo(player, new SyncBookVisualStatesMessage(this.getStateFor(player)));
     }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStates.java b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStates.java
index 552df8a4c..d4115c756 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStates.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/bookstate/BookVisualStates.java
@@ -18,10 +18,12 @@
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +45,8 @@ public BookVisualStates() {
 
     public BookVisualStates(Map<ResourceLocation, BookVisualState> bookStates, Map<ResourceLocation, List<BookAddress>> bookBookmarks) {
         this.bookStates = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>(bookStates));
-        this.bookBookmarks = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>(bookBookmarks));
+        this.bookBookmarks = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+        bookBookmarks.forEach((bookId, entries) -> this.bookBookmarks.put(bookId, new ArrayList<>(entries)));
     }
 
     public BookVisualState getBookState(Book book) {
@@ -58,6 +61,10 @@ public EntryVisualState getEntryState(BookEntry entry) {
         return this.getCategoryState(entry.getCategory()).entryStates.computeIfAbsent(entry.getId(), (id) -> new EntryVisualState());
     }
 
+    public List<BookAddress> getBookmarks(Book book) {
+        return this.bookBookmarks.computeIfAbsent(book.getId(), (id) -> new ArrayList<>());
+    }
+
     public void setBookState(Book book, BookVisualState state) {
         this.bookStates.put(book.getId(), state);
     }
@@ -69,4 +76,16 @@ public void setEntryState(BookEntry entry, EntryVisualState state) {
     public void setCategoryState(BookCategory category, CategoryVisualState state) {
         this.getBookState(category.getBook()).categoryStates.put(category.getId(), state);
     }
+
+    public void setBookmarks(Book book, List<BookAddress> bookmarks) {
+        this.bookBookmarks.put(book.getId(), bookmarks);
+    }
+
+    public void addBookmark(Book book, BookAddress bookmark) {
+        this.getBookmarks(book).add(bookmark);
+    }
+
+    public boolean removeBookmark(Book book, BookAddress bookmark) {
+        return this.getBookmarks(book).remove(bookmark);
+    }
 }
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
index 8da53f429..b13cd4cb2 100644
--- 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
@@ -212,10 +212,6 @@ protected void openBookInIndexMode(Book book, BookAddress address) {
     @ApiStatus.Internal
     public void openCategory(BookCategory category, BookAddress address) {
         if (this.openBookCategoryScreen != null) {
-            //skip if the category is already open
-            if (this.openBookCategoryScreen.getCategory() == category)
-                return;
-
             BookGuiManager.get().closeCategoryScreen(this.openBookCategoryScreen);
         }
 
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookAddress.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookAddress.java
index 176d37f20..11b2978ed 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookAddress.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookAddress.java
@@ -66,8 +66,13 @@ private BookAddress(@NotNull ResourceLocation bookId,
         this(bookId, categoryId.orElse(null), ignoreSavedCategory, entryId.orElse(null), ignoreSavedEntry, page, ignoreSavedPage);
     }
 
-    public static BookAddress ignoreSavedAndOpen(@NotNull BookEntry entry) {
-        return ignoreSaved(entry.getBook().getId(), entry.getCategory().getId(), entry.getId(), -1);
+    public static BookAddress ignoreSaved(@NotNull BookEntry entry, int page) {
+        return ignoreSaved(entry.getBook().getId(), entry.getCategory().getId(), entry.getId(), page);
+    }
+
+
+    public static BookAddress ignoreSaved(@NotNull BookEntry entry) {
+        return ignoreSaved(entry, -1);
     }
 
     public static BookAddress defaultFor(@NotNull BookCategory category) {
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookParentScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookParentScreen.java
index dbe68f5d2..23fbf3343 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookParentScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/BookParentScreen.java
@@ -27,5 +27,5 @@ public interface BookParentScreen {
 
     void saveState(BookVisualState state);
 
-    void onSyncBookUnlockCapabilityMessage(SyncBookUnlockStatesMessage message);
+    void onSyncBookUnlockStatesMessage(SyncBookUnlockStatesMessage message);
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/bookmarks/BookBookmarksScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/bookmarks/BookBookmarksScreen.java
new file mode 100644
index 000000000..bc69aaca5
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/bookmarks/BookBookmarksScreen.java
@@ -0,0 +1,269 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ * SPDX-FileCopyrightText: 2021 Authors of Patchouli
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.client.gui.book.bookmarks;
+
+import com.klikli_dev.modonomicon.api.ModonomiconConstants.I18n.Gui;
+import com.klikli_dev.modonomicon.book.Book;
+import com.klikli_dev.modonomicon.book.BookTextHolder;
+import com.klikli_dev.modonomicon.book.RenderedBookTextHolder;
+import com.klikli_dev.modonomicon.bookstate.BookUnlockStateManager;
+import com.klikli_dev.modonomicon.bookstate.BookVisualStateManager;
+import com.klikli_dev.modonomicon.client.gui.BookGuiManager;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
+import com.klikli_dev.modonomicon.client.gui.book.BookPaginatedScreen;
+import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.button.EntryListButton;
+import com.klikli_dev.modonomicon.client.gui.book.entry.BookEntryScreen;
+import com.klikli_dev.modonomicon.client.gui.book.markdown.BookTextRenderer;
+import com.klikli_dev.modonomicon.client.render.page.BookPageRenderer;
+import com.klikli_dev.modonomicon.platform.ClientServices;
+import com.klikli_dev.modonomicon.util.GuiGraphicsExt;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BookBookmarksScreen extends BookPaginatedScreen {
+    public static final int ENTRIES_PER_PAGE = 13;
+    public static final int ENTRIES_IN_FIRST_PAGE = 11;
+    protected final List<Button> entryButtons = new ArrayList<>();
+    protected final BookParentScreen parentScreen;
+    private final List<BookAddress> visibleEntries = new ArrayList<>();
+    /**
+     * The index of the two pages being displayed. 0 means Pages 0 and 1, 1 means Pages 2 and 3, etc.
+     */
+    private int openPagesIndex;
+    private int maxOpenPagesIndex;
+    private List<BookAddress> allEntries;
+    private BookTextHolder infoText;
+    private List<Component> tooltip;
+
+    public BookBookmarksScreen(BookParentScreen parentScreen) {
+        super(Component.translatable(Gui.BOOKMARKS_SCREEN_TITLE));
+        this.parentScreen = parentScreen;
+
+        this.infoText = new BookTextHolder(Gui.BOOKMARKS_INFO_TEXT);
+    }
+
+    public void handleButtonEntry(Button button) {
+        if (button instanceof EntryListButton entry) {
+            if(!BookUnlockStateManager.get().isUnlockedFor(Minecraft.getInstance().player, entry.getEntry())){
+                return;
+            }
+
+            this.onClose();
+            if (entry.getAddressToOpen() != null)
+                BookGuiManager.get().openBook(entry.getAddressToOpen());
+            else
+                BookGuiManager.get().openEntry(entry.getEntry().getBook().getId(), entry.getEntry().getId(), 0);
+        }
+    }
+
+    public void prerenderMarkdown(BookTextRenderer textRenderer) {
+
+        if (!this.infoText.hasComponent()) {
+            this.infoText = new RenderedBookTextHolder(this.infoText, textRenderer.render(this.infoText.getString()));
+        }
+    }
+
+    public void drawCenteredStringNoShadow(GuiGraphics guiGraphics, Component s, int x, int y, int color) {
+        this.drawCenteredStringNoShadow(guiGraphics, s, x, y, color, 1.0f);
+    }
+
+    public void drawCenteredStringNoShadow(GuiGraphics guiGraphics, Component s, int x, int y, int color, float scale) {
+        GuiGraphicsExt.drawString(guiGraphics, this.font, s, x - this.font.width(s) * scale / 2.0F, y + (this.font.lineHeight * (1 - scale)), color, false);
+    }
+
+    public BookParentScreen getParentScreen() {
+        return this.parentScreen;
+    }
+
+    public boolean canSeeArrowButton(boolean left) {
+        return left ? this.openPagesIndex > 0 : (this.openPagesIndex + 1) < this.maxOpenPagesIndex;
+    }
+
+    protected void flipPage(boolean left, boolean playSound) {
+        if (this.canSeeArrowButton(left)) {
+
+            if (left) {
+                this.openPagesIndex--;
+            } else {
+                this.openPagesIndex++;
+            }
+
+            this.onPageChanged();
+            if (playSound) {
+                BookEntryScreen.playTurnPageSound(this.parentScreen.getBook());
+            }
+        }
+    }
+
+
+    protected void drawTooltip(GuiGraphics guiGraphics, int pMouseX, int pMouseY) {
+        if (this.tooltip != null && !this.tooltip.isEmpty()) {
+            guiGraphics.renderComponentTooltip(this.font, this.tooltip, pMouseX, pMouseY);
+        }
+    }
+
+    protected void onPageChanged() {
+        this.createEntryList();
+    }
+
+    protected void resetTooltip() {
+        this.tooltip = null;
+    }
+
+    private void createEntryList() {
+        this.entryButtons.forEach(b -> {
+            this.renderables.remove(b);
+            this.children().remove(b);
+            this.narratables.remove(b);
+        });
+
+        this.entryButtons.clear();
+        this.visibleEntries.clear();
+
+        //here we could do some filtering like on the search screen
+        this.visibleEntries.addAll(this.allEntries);
+
+        this.maxOpenPagesIndex = 1;
+        int count = this.visibleEntries.size();
+        count -= ENTRIES_IN_FIRST_PAGE;
+        if (count > 0) {
+            this.maxOpenPagesIndex += (int) Math.ceil((float) count / (ENTRIES_PER_PAGE * 2));
+        }
+
+        while (this.getEntryCountStart() > this.visibleEntries.size()) {
+            this.openPagesIndex--;
+        }
+
+        if (this.openPagesIndex == 0) {
+            //only show on the right for the first page
+            this.addEntryButtons(BookEntryScreen.RIGHT_PAGE_X - 3, BookEntryScreen.TOP_PADDING + 20, 0, ENTRIES_IN_FIRST_PAGE);
+        } else {
+            int start = this.getEntryCountStart();
+            this.addEntryButtons(BookEntryScreen.LEFT_PAGE_X, BookEntryScreen.TOP_PADDING, start, ENTRIES_PER_PAGE);
+            this.addEntryButtons(BookEntryScreen.RIGHT_PAGE_X - 3, BookEntryScreen.TOP_PADDING, start + ENTRIES_PER_PAGE, ENTRIES_PER_PAGE);
+        }
+    }
+
+    private int getEntryCountStart() {
+        if (this.openPagesIndex == 0) {
+            return 0;
+        }
+
+        int start = ENTRIES_IN_FIRST_PAGE;
+        start += (ENTRIES_PER_PAGE * 2) * (this.openPagesIndex - 1);
+        return start;
+    }
+
+    @Override
+    public void setTooltip(List<Component> tooltip) {
+        this.tooltip = tooltip;
+    }
+
+    @Override
+    public Book getBook() {
+        return this.parentScreen.getBook();
+    }
+
+    @Override
+    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
+
+        this.resetTooltip();
+
+        //we need to modify blit offset (now: z pose) to not draw over toasts
+        guiGraphics.pose().pushPose();
+        guiGraphics.pose().translate(0, 0, -1300);  //magic number arrived by testing until toasts show, but BookOverviewScreen does not
+        this.renderBackground(guiGraphics, pMouseX, pMouseY, pPartialTick);
+        guiGraphics.pose().popPose();
+
+        guiGraphics.pose().pushPose();
+        guiGraphics.pose().translate(this.bookLeft, this.bookTop, 0);
+
+        BookEntryScreen.renderBookBackground(guiGraphics, this.getBook().getBookContentTexture());
+
+
+        if (this.openPagesIndex == 0) {
+            this.drawCenteredStringNoShadow(guiGraphics, this.getTitle(),
+                    BookEntryScreen.LEFT_PAGE_X + BookEntryScreen.PAGE_WIDTH / 2, BookEntryScreen.TOP_PADDING,
+                    this.parentScreen.getBook().getDefaultTitleColor());
+            this.drawCenteredStringNoShadow(guiGraphics, Component.translatable(Gui.BOOKMARKS_ENTRY_LIST_TITLE),
+                    BookEntryScreen.RIGHT_PAGE_X + BookEntryScreen.PAGE_WIDTH / 2, BookEntryScreen.TOP_PADDING,
+                    this.parentScreen.getBook().getDefaultTitleColor());
+
+            BookEntryScreen.drawTitleSeparator(guiGraphics, this.parentScreen.getBook(),
+                    BookEntryScreen.LEFT_PAGE_X + BookEntryScreen.PAGE_WIDTH / 2, BookEntryScreen.TOP_PADDING + 12);
+            BookEntryScreen.drawTitleSeparator(guiGraphics, this.parentScreen.getBook(),
+                    BookEntryScreen.RIGHT_PAGE_X + BookEntryScreen.PAGE_WIDTH / 2, BookEntryScreen.TOP_PADDING + 12);
+
+            BookPageRenderer.renderBookTextHolder(guiGraphics, this.infoText, this.font,
+                    BookEntryScreen.LEFT_PAGE_X, BookEntryScreen.TOP_PADDING + 22, BookEntryScreen.PAGE_WIDTH);
+        }
+
+        if (this.visibleEntries.isEmpty()) {
+            this.drawCenteredStringNoShadow(guiGraphics, Component.translatable(Gui.BOOKMARKS_NO_RESULTS), BookEntryScreen.RIGHT_PAGE_X + BookEntryScreen.PAGE_WIDTH / 2, 80, 0x333333);
+        }
+        guiGraphics.pose().popPose();
+
+        //do not translate super (= widget rendering) -> otherwise our buttons are messed up
+        //manually call the renderables like super does -> otherwise super renders the background again on top of our stuff
+        for (var renderable : this.renderables) {
+            renderable.render(guiGraphics, pMouseX, pMouseY, pPartialTick);
+        }
+
+        this.drawTooltip(guiGraphics, pMouseX, pMouseY);
+    }
+
+
+    @Override
+    public void onClose() {
+        //Search screen is not supposed to close everything on Esc, so we just pop a layer.
+        ClientServices.GUI.popGuiLayer();
+    }
+
+    @Override
+    public boolean keyPressed(int key, int scanCode, int modifiers) {
+        if (key == GLFW.GLFW_KEY_ENTER) {
+            if (this.visibleEntries.size() == 1) {
+                var entry = this.visibleEntries.get(0);
+                this.onClose();
+                BookGuiManager.get().openBook(entry);
+                return true;
+            }
+        }
+
+        return super.keyPressed(key, scanCode, modifiers);
+    }
+
+    @Override
+    public void init() {
+        super.init();
+
+        var textRenderer = new BookTextRenderer(this.getBook(), this.minecraft.level.registryAccess());
+        this.prerenderMarkdown(textRenderer);
+
+        //get bookmarks in original order (as player added them)
+        this.allEntries = BookVisualStateManager.get().getBookmarksFor(this.minecraft.player, this.getBook());
+
+        this.createEntryList();
+    }
+
+    void addEntryButtons(int x, int y, int start, int count) {
+        for (int i = 0; i < count && (i + start) < this.visibleEntries.size(); i++) {
+            var address = this.visibleEntries.get(start + i);
+            Button button = new EntryListButton(this.getBook().getEntry(address.entryId()), address, this.bookLeft + x, this.bookTop + y + i * 11, this::handleButtonEntry);
+            this.addRenderableWidget(button);
+            this.entryButtons.add(button);
+        }
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/AddBookmarkButton.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/AddBookmarkButton.java
new file mode 100644
index 000000000..b3cbab8d9
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/AddBookmarkButton.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.client.gui.book.button;
+
+import com.klikli_dev.modonomicon.book.entries.BookEntry;
+import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.entry.BookEntryScreen;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+public class AddBookmarkButton extends Button {
+
+    private final BookEntryScreen parent;
+    private final int scissorX;
+
+    public AddBookmarkButton(BookEntryScreen parent, int pX, int pY, int scissorX, int width, int height, OnPress pOnPress, Tooltip tooltip) {
+        super(pX, pY, width, height, Component.literal(""), pOnPress, Button.DEFAULT_NARRATION);
+        this.setTooltip(tooltip);
+        this.scissorX = scissorX;
+        this.parent = parent;
+    }
+
+    @Override
+    public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks) {
+        if (this.visible) {
+            guiGraphics.pose().pushPose();
+            int xOffset = this.parent.getBook().getSearchButtonXOffset();
+            guiGraphics.pose().translate(xOffset, 0, 0);
+
+            int scissorX = this.scissorX + xOffset;
+            int texX = 68;
+            int texY = 145;
+
+            int renderX = this.getX();
+            int scissorWidth = this.width + (this.getX() - this.scissorX);
+            int scissorY = (((Screen) this.parent).height - this.getY() - this.height - 1); //from the bottom up
+
+            if (this.isHovered()) {
+                renderX += 1;
+                scissorWidth -= 1;
+            }
+
+            //as of 1.20 this causes the button to vanish behind the rendered world, so we don't use it
+            //guiGraphics.pose().translate(xOffset, 0, -1000);
+
+            //GL scissors allows us to move the button on hover without intersecting with book border
+            guiGraphics.enableScissor(scissorX, scissorY, scissorX + scissorWidth, scissorY + 1000);
+
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            guiGraphics.blit(this.parent.getBook().getBookOverviewTexture(), renderX, this.getY(), texX, texY, this.width, this.height, 256, 256);
+
+            guiGraphics.disableScissor();
+
+            guiGraphics.pose().popPose();
+
+        }
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/EntryListButton.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/EntryListButton.java
index d190f0bf2..8fdda9ff2 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/EntryListButton.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/EntryListButton.java
@@ -12,6 +12,7 @@
 import com.klikli_dev.modonomicon.book.entries.BookEntry;
 import com.klikli_dev.modonomicon.bookstate.BookUnlockStateManager;
 import com.klikli_dev.modonomicon.client.ClientTicks;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
 import com.klikli_dev.modonomicon.client.gui.book.entry.BookEntryScreen;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
@@ -20,24 +21,35 @@
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import org.jetbrains.annotations.Nullable;
 
 public class EntryListButton extends Button {
 
     private static final int ANIM_TIME = 5;
 
     private final BookEntry entry;
+    private final @Nullable BookAddress addressToOpen;
     private float timeHovered;
 
     public EntryListButton(BookEntry entry, int pX, int pY, OnPress pOnPress) {
+        this(entry, null, pX, pY, pOnPress);
+    }
+
+    public EntryListButton(BookEntry entry, @Nullable BookAddress addressToOpen, int pX, int pY, OnPress pOnPress) {
         super(pX, pY, BookEntryScreen.PAGE_WIDTH, 10, Component.translatable(entry.getName()), pOnPress, Button.DEFAULT_NARRATION);
 
         this.entry = entry;
+        this.addressToOpen = addressToOpen;
     }
 
     public BookEntry getEntry() {
         return this.entry;
     }
 
+    public @Nullable BookAddress getAddressToOpen() {
+        return this.addressToOpen;
+    }
+
     private int getEntryColor() {
         return 0x000000;
     }
@@ -85,6 +97,4 @@ public void playDownSound(SoundManager soundHandlerIn) {
             //TODO: play flip sound
         }
     }
-
-
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/RemoveBookmarkButton.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/RemoveBookmarkButton.java
new file mode 100644
index 000000000..f5f9fbf04
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/RemoveBookmarkButton.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.client.gui.book.button;
+
+import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.entry.BookEntryScreen;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+public class RemoveBookmarkButton extends Button {
+
+    private final BookEntryScreen parent;
+    private final int scissorX;
+
+    public RemoveBookmarkButton(BookEntryScreen parent, int pX, int pY, int scissorX, int width, int height, OnPress pOnPress, Tooltip tooltip) {
+        super(pX, pY, width, height, Component.literal(""), pOnPress, Button.DEFAULT_NARRATION);
+        this.setTooltip(tooltip);
+        this.scissorX = scissorX;
+        this.parent = parent;
+    }
+
+    @Override
+    public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks) {
+        if (this.visible) {
+            guiGraphics.pose().pushPose();
+            int xOffset = this.parent.getBook().getSearchButtonXOffset();
+            guiGraphics.pose().translate(xOffset, 0, 0);
+
+            int scissorX = this.scissorX + xOffset;
+            int texX = 68;
+            int texY = 125;
+
+            int renderX = this.getX();
+            int scissorWidth = this.width + (this.getX() - this.scissorX);
+            int scissorY = (((Screen) this.parent).height - this.getY() - this.height - 1); //from the bottom up
+
+            if (this.isHovered()) {
+                renderX += 1;
+                scissorWidth -= 1;
+            }
+
+            //as of 1.20 this causes the button to vanish behind the rendered world, so we don't use it
+            //guiGraphics.pose().translate(xOffset, 0, -1000);
+
+            //GL scissors allows us to move the button on hover without intersecting with book border
+            guiGraphics.enableScissor(scissorX, scissorY, scissorX + scissorWidth, scissorY + 1000);
+
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            guiGraphics.blit(this.parent.getBook().getBookOverviewTexture(), renderX, this.getY(), texX, texY, this.width, this.height, 256, 256);
+
+            guiGraphics.disableScissor();
+
+            guiGraphics.pose().popPose();
+
+        }
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/ShowBookmarksButton.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/ShowBookmarksButton.java
new file mode 100644
index 000000000..f9ee27189
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/button/ShowBookmarksButton.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.client.gui.book.button;
+
+import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+public class ShowBookmarksButton extends Button {
+
+    private final BookParentScreen parent;
+    private final int scissorX;
+
+    public ShowBookmarksButton(BookParentScreen parent, int pX, int pY, int scissorX, int width, int height, OnPress pOnPress, Tooltip tooltip) {
+        super(pX, pY, width, height, Component.literal(""), pOnPress, Button.DEFAULT_NARRATION);
+        this.setTooltip(tooltip);
+        this.scissorX = scissorX;
+        this.parent = parent;
+    }
+
+    @Override
+    public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks) {
+        if (this.visible) {
+            guiGraphics.pose().pushPose();
+            int xOffset = this.parent.getBook().getSearchButtonXOffset();
+            guiGraphics.pose().translate(xOffset, 0, 0);
+
+            int scissorX = this.scissorX + xOffset;
+            int texX = 68;
+            int texY = 165;
+
+            int renderX = this.getX();
+            int scissorWidth = this.width + (this.getX() - this.scissorX);
+            int scissorY = (((Screen) this.parent).height - this.getY() - this.height - 1); //from the bottom up
+
+            if (this.isHovered()) {
+                renderX += 1;
+                scissorWidth -= 1;
+            }
+
+            //as of 1.20 this causes the button to vanish behind the rendered world, so we don't use it
+            //guiGraphics.pose().translate(xOffset, 0, -1000);
+
+            //GL scissors allows us to move the button on hover without intersecting with book border
+            guiGraphics.enableScissor(scissorX, scissorY, scissorX + scissorWidth, scissorY + 1000);
+
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+            guiGraphics.blit(this.parent.getBook().getBookOverviewTexture(), renderX, this.getY(), texX, texY, this.width, this.height, 256, 256);
+
+            guiGraphics.disableScissor();
+
+            guiGraphics.pose().popPose();
+
+        }
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryDoublePageScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryDoublePageScreen.java
index 33e805015..3ad781d8e 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryDoublePageScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryDoublePageScreen.java
@@ -37,6 +37,11 @@ protected int getOpenPagesIndexForPage(int pageIndex) {
         return 0;
     }
 
+    @Override
+    protected int getPageForOpenPagesIndex(int openPagesIndex) {
+        return openPagesIndex / 2;
+    }
+
     @Override
     public boolean canSeeArrowButton(boolean left) {
         return left ? this.openPagesIndex > 0 : (this.openPagesIndex + 2) < this.unlockedPages.size();
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryScreen.java
index 4064a602d..0df00df53 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntryScreen.java
@@ -15,19 +15,26 @@
 import com.klikli_dev.modonomicon.book.entries.BookContentEntry;
 import com.klikli_dev.modonomicon.book.page.BookPage;
 import com.klikli_dev.modonomicon.bookstate.BookUnlockStateManager;
+import com.klikli_dev.modonomicon.bookstate.BookVisualStateManager;
 import com.klikli_dev.modonomicon.bookstate.visual.EntryVisualState;
 import com.klikli_dev.modonomicon.client.ClientTicks;
 import com.klikli_dev.modonomicon.client.gui.BookGuiManager;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
 import com.klikli_dev.modonomicon.client.gui.book.BookPaginatedScreen;
 import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.button.AddBookmarkButton;
 import com.klikli_dev.modonomicon.client.gui.book.button.BackButton;
+import com.klikli_dev.modonomicon.client.gui.book.button.RemoveBookmarkButton;
+import com.klikli_dev.modonomicon.client.gui.book.button.SearchButton;
 import com.klikli_dev.modonomicon.client.gui.book.markdown.ItemLinkRenderer;
 import com.klikli_dev.modonomicon.client.render.page.BookPageRenderer;
 import com.klikli_dev.modonomicon.client.render.page.PageRendererRegistry;
 import com.klikli_dev.modonomicon.data.BookDataManager;
 import com.klikli_dev.modonomicon.fluid.FluidHolder;
 import com.klikli_dev.modonomicon.integration.ModonomiconJeiIntegration;
+import com.klikli_dev.modonomicon.networking.AddBookmarkMessage;
 import com.klikli_dev.modonomicon.networking.ClickCommandLinkMessage;
+import com.klikli_dev.modonomicon.networking.SyncBookVisualStatesMessage;
 import com.klikli_dev.modonomicon.platform.ClientServices;
 import com.klikli_dev.modonomicon.platform.Services;
 import com.klikli_dev.modonomicon.platform.services.FluidHelper;
@@ -37,6 +44,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Renderable;
+import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
@@ -689,6 +697,63 @@ protected void initNavigationButtons() {
         super.initNavigationButtons();
 
         this.addRenderableWidget(new BackButton(this, this.width / 2 - BackButton.WIDTH / 2, this.bookTop + FULL_HEIGHT - BackButton.HEIGHT / 2));
+
+        this.updateBookmarksButton();
+    }
+
+    protected boolean isBookmarked() {
+        return BookVisualStateManager.get().getBookmarksFor(this.minecraft.player, this.entry.getBook()).stream().anyMatch(b -> b.entryId().equals(this.entry.getId()));
+    }
+
+    protected void updateBookmarksButton() {
+        this.renderables.removeIf(b -> b instanceof AddBookmarkButton || b instanceof SearchButton);
+        this.children().removeIf(b -> b instanceof AddBookmarkButton || b instanceof SearchButton);
+        this.narratables.removeIf(b -> b instanceof AddBookmarkButton || b instanceof SearchButton);
+
+        int buttonHeight = 20;
+        int searchButtonX = this.bookLeft + FULL_WIDTH - 5;
+        int searchButtonY = this.bookTop + FULL_HEIGHT - 30;
+        int searchButtonWidth = 44; //width in png
+        int scissorX = this.bookLeft + FULL_WIDTH;//this is the render location of our frame so our search button never overlaps
+
+
+        if (this.isBookmarked()) {
+            var removeBookMarkButton = new RemoveBookmarkButton(this, searchButtonX, searchButtonY,
+                    scissorX,
+                    searchButtonWidth, buttonHeight,
+                    (b) -> this.onRemoveBookmarksButtonClick((RemoveBookmarkButton) b),
+                    Tooltip.create(Component.translatable(Gui.ADD_BOOKMARK)));
+            this.addRenderableWidget(removeBookMarkButton);
+        } else {
+            var addBookmarkButton = new AddBookmarkButton(this, searchButtonX, searchButtonY,
+                    scissorX,
+                    searchButtonWidth, buttonHeight,
+                    (b) -> this.onAddBookmarksButtonClick((AddBookmarkButton) b),
+                    Tooltip.create(Component.translatable(Gui.ADD_BOOKMARK)));
+            this.addRenderableWidget(addBookmarkButton);
+        }
+
+    }
+
+    protected void onAddBookmarksButtonClick(AddBookmarkButton button) {
+        if (!this.isBookmarked()) {
+            var bookmarkAddress = BookAddress.ignoreSaved(this.entry, this.getPageForOpenPagesIndex(this.openPagesIndex));
+            BookVisualStateManager.get().addBookmarkFor(this.minecraft.player, this.entry.getBook(), bookmarkAddress);
+
+            Services.NETWORK.sendToServer(new AddBookmarkMessage(bookmarkAddress));
+
+            this.updateBookmarksButton();
+        }
+    }
+
+    protected void onRemoveBookmarksButtonClick(RemoveBookmarkButton button) {
+        //no need to check for is bookmarked because we query the bookmark in question directly anyway
+        var bookmarkAddress = BookVisualStateManager.get().getBookmarksFor(this.minecraft.player, this.entry.getBook()).stream().filter(b -> b.entryId().equals(this.entry.getId())).findFirst().orElse(null);
+        if (bookmarkAddress != null) {
+            BookVisualStateManager.get().removeBookmarkFor(this.minecraft.player, this.entry.getBook(), bookmarkAddress);
+
+            this.updateBookmarksButton();
+        }
     }
 
     @Override
@@ -716,9 +781,17 @@ public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
         return this.mouseClickedPage(pMouseX, pMouseY, pButton);
     }
 
+    public void onSyncBookVisualStatesMessage(SyncBookVisualStatesMessage message) {
+        this.updateBookmarksButton();
+    }
 
     protected abstract int getOpenPagesIndexForPage(int pageIndex);
 
+    /**
+     * Gets the page index for the first page to display for the given open pages index.
+     */
+    protected abstract int getPageForOpenPagesIndex(int openPagesIndex);
+
     @Nullable
     protected abstract Style getClickedComponentStyleAt(double pMouseX, double pMouseY);
 
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntrySinglePageScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntrySinglePageScreen.java
index f50c010a9..103b24547 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntrySinglePageScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/entry/BookEntrySinglePageScreen.java
@@ -9,7 +9,6 @@
 import com.klikli_dev.modonomicon.client.render.page.BookPageRenderer;
 import com.klikli_dev.modonomicon.client.render.page.PageRendererRegistry;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Style;
 import net.minecraft.resources.ResourceLocation;
@@ -47,6 +46,8 @@ protected void initNavigationButtons() {
             this.addRenderableWidget(new ExitButton(this, this.bookLeft + SINGLE_PAGE_BOOK_BACKGROUND_WIDTH - 10, this.bookTop - 2, this::handleExitButton));
         }
         this.addRenderableWidget(new BackButton(this, this.width / 2 - BackButton.WIDTH / 2, this.bookTop + SINGLE_PAGE_BOOK_BACKGROUND_HEIGHT - BackButton.HEIGHT / 2));
+
+        this.updateBookmarksButton();
     }
 
     @Override
@@ -54,6 +55,11 @@ protected int getOpenPagesIndexForPage(int pageIndex) {
         return pageIndex; //for single page screens the index is equivalent to the page number
     }
 
+    @Override
+    protected int getPageForOpenPagesIndex(int openPagesIndex) {
+        return openPagesIndex;
+    }
+
     @Override
     public boolean canSeeArrowButton(boolean left) {
         return left ? this.openPagesIndex > 0 : (this.openPagesIndex + 1) < this.unlockedPages.size();
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/index/BookParentIndexScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/index/BookParentIndexScreen.java
index 27e9b6773..24fab0fc3 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/index/BookParentIndexScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/index/BookParentIndexScreen.java
@@ -17,9 +17,11 @@
 import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
 import com.klikli_dev.modonomicon.client.gui.book.BookPaginatedScreen;
 import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.bookmarks.BookBookmarksScreen;
 import com.klikli_dev.modonomicon.client.gui.book.button.CategoryListButton;
 import com.klikli_dev.modonomicon.client.gui.book.button.ReadAllButton;
 import com.klikli_dev.modonomicon.client.gui.book.button.SearchButton;
+import com.klikli_dev.modonomicon.client.gui.book.button.ShowBookmarksButton;
 import com.klikli_dev.modonomicon.client.gui.book.entry.BookEntryScreen;
 import com.klikli_dev.modonomicon.client.gui.book.search.BookSearchScreen;
 import com.klikli_dev.modonomicon.client.render.page.BookPageRenderer;
@@ -271,7 +273,7 @@ public void saveState(BookVisualState state) {
     }
 
     @Override
-    public void onSyncBookUnlockCapabilityMessage(SyncBookUnlockStatesMessage message) {
+    public void onSyncBookUnlockStatesMessage(SyncBookUnlockStatesMessage message) {
         //this leads to re-init of the category buttons after a potential unlock
         this.rebuildWidgets();
 
@@ -347,14 +349,26 @@ public void init() {
                 searchButtonWidth, buttonHeight,
                 (b) -> this.onSearchButtonClick((SearchButton) b),
                 Tooltip.create(Component.translatable(ModonomiconConstants.I18n.Gui.OPEN_SEARCH)));
-
         this.addRenderableWidget(searchButton);
+
+        searchButtonY -= buttonHeight + 2;
+
+        var showBookmarksButton = new ShowBookmarksButton(this, searchButtonX, searchButtonY,
+                scissorX,
+                searchButtonWidth, buttonHeight,
+                (b) -> this.onShowBookmarksButtonClick((ShowBookmarksButton) b),
+                Tooltip.create(Component.translatable(ModonomiconConstants.I18n.Gui.OPEN_BOOKMARKS)));
+        this.addRenderableWidget(showBookmarksButton);
     }
 
     protected void onSearchButtonClick(SearchButton button) {
         ClientServices.GUI.pushGuiLayer(new BookSearchScreen(this));
     }
 
+    protected void onShowBookmarksButtonClick(ShowBookmarksButton button) {
+        ClientServices.GUI.pushGuiLayer(new BookBookmarksScreen(this));
+    }
+
     protected void addEntryButtons(int x, int y, int start, int count) {
         for (int i = 0; i < count && (i + start) < this.visibleEntries.size(); i++) {
             Button button = new CategoryListButton(this.visibleEntries.get(start + i), this.bookLeft + x, this.bookTop + y + i * 11, this::handleButtonEntry);
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/node/BookParentNodeScreen.java b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/node/BookParentNodeScreen.java
index 74ec7f0de..386eb2898 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/node/BookParentNodeScreen.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/gui/book/node/BookParentNodeScreen.java
@@ -15,9 +15,11 @@
 import com.klikli_dev.modonomicon.client.gui.BookGuiManager;
 import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
 import com.klikli_dev.modonomicon.client.gui.book.BookParentScreen;
+import com.klikli_dev.modonomicon.client.gui.book.bookmarks.BookBookmarksScreen;
 import com.klikli_dev.modonomicon.client.gui.book.button.CategoryButton;
 import com.klikli_dev.modonomicon.client.gui.book.button.ReadAllButton;
 import com.klikli_dev.modonomicon.client.gui.book.button.SearchButton;
+import com.klikli_dev.modonomicon.client.gui.book.button.ShowBookmarksButton;
 import com.klikli_dev.modonomicon.client.gui.book.search.BookSearchScreen;
 import com.klikli_dev.modonomicon.networking.ClickReadAllButtonMessage;
 import com.klikli_dev.modonomicon.networking.SyncBookUnlockStatesMessage;
@@ -279,7 +281,7 @@ public boolean handleComponentClicked(@Nullable Style pStyle) {
     }
 
     @Override
-    public void onSyncBookUnlockCapabilityMessage(SyncBookUnlockStatesMessage message) {
+    public void onSyncBookUnlockStatesMessage(SyncBookUnlockStatesMessage message) {
         //this leads to re-init of the category buttons after a potential unlock
         this.rebuildWidgets();
         this.updateUnreadEntriesState();
@@ -340,14 +342,26 @@ protected void init() {
                 searchButtonWidth, buttonHeight,
                 (b) -> this.onSearchButtonClick((SearchButton) b),
                 Tooltip.create(Component.translatable(ModonomiconConstants.I18n.Gui.OPEN_SEARCH)));
-
         this.addRenderableWidget(searchButton);
+
+        searchButtonY -= buttonHeight + 2;
+
+        var showBookmarksButton = new ShowBookmarksButton(this, searchButtonX, searchButtonY,
+                scissorX,
+                searchButtonWidth, buttonHeight,
+                (b) -> this.onShowBookmarksButtonClick((ShowBookmarksButton) b),
+                Tooltip.create(Component.translatable(ModonomiconConstants.I18n.Gui.OPEN_BOOKMARKS)));
+        this.addRenderableWidget(showBookmarksButton);
     }
 
     protected void onSearchButtonClick(SearchButton button) {
         ClientServices.GUI.pushGuiLayer(new BookSearchScreen(this));
     }
 
+    protected void onShowBookmarksButtonClick(ShowBookmarksButton button) {
+        ClientServices.GUI.pushGuiLayer(new BookBookmarksScreen(this));
+    }
+
     @Override
     public boolean isPauseScreen() {
         return false;
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/client/render/page/PageRendererRegistry.java b/common/src/main/java/com/klikli_dev/modonomicon/client/render/page/PageRendererRegistry.java
index b7054caf6..fd02aea65 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/client/render/page/PageRendererRegistry.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/client/render/page/PageRendererRegistry.java
@@ -9,6 +9,10 @@
 import com.klikli_dev.modonomicon.api.ModonomiconConstants.Data.Page;
 import com.klikli_dev.modonomicon.book.page.*;
 import com.klikli_dev.modonomicon.fluid.FluidHolder;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import it.unimi.dsi.fastutil.objects.ObjectSets;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -18,12 +22,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class PageRendererRegistry {
-    static final Set<Item> ITEMS_NOT_TO_RENDER = ConcurrentHashMap.newKeySet();
-    static final Set<Fluid> FLUIDS_NOT_TO_RENDER = ConcurrentHashMap.newKeySet();
-    private static final Map<ResourceLocation, PageRendererFactory> pageRenderers = new ConcurrentHashMap<>();
+    static final Set<Item> ITEMS_NOT_TO_RENDER = ObjectSets.synchronize(new ObjectOpenHashSet<>());
+    static final Set<Fluid> FLUIDS_NOT_TO_RENDER = ObjectSets.synchronize(new ObjectOpenHashSet<>());
+    private static final Map<ResourceLocation, PageRendererFactory> pageRenderers = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
     /**
      * Call from client setup
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/data/LoaderRegistry.java b/common/src/main/java/com/klikli_dev/modonomicon/data/LoaderRegistry.java
index 559b755f7..9e7ea96b3 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/data/LoaderRegistry.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/data/LoaderRegistry.java
@@ -21,33 +21,34 @@
 import com.klikli_dev.modonomicon.multiblock.DenseMultiblock;
 import com.klikli_dev.modonomicon.multiblock.SparseMultiblock;
 import com.klikli_dev.modonomicon.multiblock.matcher.*;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class LoaderRegistry {
 
-    private static final Map<ResourceLocation, BookEntryJsonLoader<? extends BookEntry>> entryTypeJsonLoaders = new ConcurrentHashMap<>();
-    private static final Map<ResourceLocation, NetworkLoader<? extends BookEntry>> entryTypeNetworkLoaders = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, BookEntryJsonLoader<? extends BookEntry>> entryTypeJsonLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+    private static final Map<ResourceLocation, NetworkLoader<? extends BookEntry>> entryTypeNetworkLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
-    private static final Map<ResourceLocation, JsonLoader<? extends BookPage>> pageJsonLoaders = new ConcurrentHashMap<>();
-    private static final Map<ResourceLocation, NetworkLoader<? extends BookPage>> pageNetworkLoaders = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, JsonLoader<? extends BookPage>> pageJsonLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+    private static final Map<ResourceLocation, NetworkLoader<? extends BookPage>> pageNetworkLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
-    private static final Map<ResourceLocation, JsonLoader<? extends BookCondition>> conditionJsonLoaders = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, JsonLoader<? extends BookCondition>> conditionJsonLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
-    private static final Map<ResourceLocation, NetworkLoader<? extends BookCondition>> conditionNetworkLoaders = new ConcurrentHashMap<>();
-    private static final Map<ResourceLocation, JsonLoader<? extends Multiblock>> multiblockJsonLoaders = new ConcurrentHashMap<>();
-    private static final Map<ResourceLocation, NetworkLoader<? extends Multiblock>> multiblockNetworkLoaders = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, NetworkLoader<? extends BookCondition>> conditionNetworkLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+    private static final Map<ResourceLocation, JsonLoader<? extends Multiblock>> multiblockJsonLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+    private static final Map<ResourceLocation, NetworkLoader<? extends Multiblock>> multiblockNetworkLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
-    private static final Map<ResourceLocation, JsonLoader<? extends StateMatcher>> stateMatcherJsonLoaders = new ConcurrentHashMap<>();
-    private static final Map<ResourceLocation, NetworkLoader<? extends StateMatcher>> stateMatcherNetworkLoaders = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, JsonLoader<? extends StateMatcher>> stateMatcherJsonLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
+    private static final Map<ResourceLocation, NetworkLoader<? extends StateMatcher>> stateMatcherNetworkLoaders = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
 
-    private static final Map<ResourceLocation, TriPredicate<BlockGetter, BlockPos, BlockState>> predicates = new ConcurrentHashMap<>();
+    private static final Map<ResourceLocation, TriPredicate<BlockGetter, BlockPos, BlockState>> predicates = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
 
     /**
      * Call from common setup
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
index de6ec1ae7..8faa8ea40 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/datagen/EnUsProvider.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/datagen/EnUsProvider.java
@@ -67,6 +67,23 @@ private void addMisc() {
         this.add(Gui.BOOK_INDEX_LIST_TITLE, "Categories");
         this.add(Gui.CATEGORY_INDEX_LIST_TITLE, "Entries");
 
+        this.add(Gui.BOOKMARKS_SCREEN_TITLE, "Bookmarks");
+        this.add(Gui.BOOKMARKS_ENTRY_LIST_TITLE, "Bookmark Entries");
+        this.add(Gui.BOOKMARKS_NO_RESULTS, "No entries yet.");
+        this.add(Gui.BOOKMARKS_INFO_TEXT, """
+                To navigate to a bookmark, click on it in this list.
+                \\
+                \\
+                To add a bookmark, open an entry and click the "Add Bookmark" button on the bottom right.
+                \\
+                \\
+                To remove a bookmark, navigate to it and click the "Remove Bookmark" button on the bottom right.
+                """);
+
+        this.add(Gui.OPEN_BOOKMARKS, "Open Bookmarks");
+        this.add(Gui.ADD_BOOKMARK, "Add Bookmark");
+        this.add(Gui.REMOVE_BOOKMARK, "Remove Bookmark");
+
         this.add(Gui.RECIPE_PAGE_RECIPE_MISSING, "Recipe %s was not found! This may be an issue with the mod, or the modpack may have disabled it.");
 
         //Tooltip
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/networking/AddBookmarkMessage.java b/common/src/main/java/com/klikli_dev/modonomicon/networking/AddBookmarkMessage.java
new file mode 100644
index 000000000..0f141aacd
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/networking/AddBookmarkMessage.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.networking;
+
+import com.klikli_dev.modonomicon.Modonomicon;
+import com.klikli_dev.modonomicon.book.entries.BookEntry;
+import com.klikli_dev.modonomicon.bookstate.BookVisualStateManager;
+import com.klikli_dev.modonomicon.bookstate.visual.EntryVisualState;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
+import com.klikli_dev.modonomicon.data.BookDataManager;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+
+public class AddBookmarkMessage implements Message {
+
+    public static final Type<AddBookmarkMessage> TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Modonomicon.MOD_ID, "add_bookmark"));
+
+    public static final StreamCodec<RegistryFriendlyByteBuf, AddBookmarkMessage> STREAM_CODEC = StreamCodec.composite(
+            BookAddress.STREAM_CODEC,
+            (m) -> m.address,
+            AddBookmarkMessage::new
+    );
+
+
+    public BookAddress address;
+
+    public AddBookmarkMessage(BookAddress address) {
+        this.address = address;
+    }
+
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
+    }
+
+    @Override
+    public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player) {
+        var book = BookDataManager.get().getBook(this.address.bookId());
+        if(BookVisualStateManager.get().getBookmarksFor(player, book).stream().noneMatch(e -> e.entryId().equals(this.address.entryId()))){
+            BookVisualStateManager.get().addBookmarkFor(player, book, this.address);
+        }
+        BookVisualStateManager.get().syncFor(player);
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/networking/RemoveBookmarkMessage.java b/common/src/main/java/com/klikli_dev/modonomicon/networking/RemoveBookmarkMessage.java
new file mode 100644
index 000000000..8df4a28a3
--- /dev/null
+++ b/common/src/main/java/com/klikli_dev/modonomicon/networking/RemoveBookmarkMessage.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2022 klikli-dev
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.klikli_dev.modonomicon.networking;
+
+import com.klikli_dev.modonomicon.Modonomicon;
+import com.klikli_dev.modonomicon.bookstate.BookVisualStateManager;
+import com.klikli_dev.modonomicon.client.gui.book.BookAddress;
+import com.klikli_dev.modonomicon.data.BookDataManager;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+
+public class RemoveBookmarkMessage implements Message {
+
+    public static final Type<RemoveBookmarkMessage> TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Modonomicon.MOD_ID, "remove_bookmark"));
+
+    public static final StreamCodec<RegistryFriendlyByteBuf, RemoveBookmarkMessage> STREAM_CODEC = StreamCodec.composite(
+            BookAddress.STREAM_CODEC,
+            (m) -> m.address,
+            RemoveBookmarkMessage::new
+    );
+
+
+    public BookAddress address;
+
+    public RemoveBookmarkMessage(BookAddress address) {
+        this.address = address;
+    }
+
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return TYPE;
+    }
+
+    @Override
+    public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player) {
+        var book = BookDataManager.get().getBook(this.address.bookId());
+        BookVisualStateManager.get().removeBookmarkFor(player, book, this.address);
+        BookVisualStateManager.get().syncFor(player);
+    }
+}
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookUnlockStatesMessage.java b/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookUnlockStatesMessage.java
index 5004c699f..07d10d935 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookUnlockStatesMessage.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookUnlockStatesMessage.java
@@ -11,6 +11,7 @@
 import com.klikli_dev.modonomicon.bookstate.BookUnlockStateManager;
 import com.klikli_dev.modonomicon.bookstate.BookUnlockStates;
 import com.klikli_dev.modonomicon.client.gui.BookGuiManager;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
@@ -19,7 +20,6 @@
 import net.minecraft.world.entity.player.Player;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class SyncBookUnlockStatesMessage implements Message {
 
@@ -47,14 +47,14 @@ public void onClientReceived(Minecraft minecraft, Player player) {
         //we are not allowed to overwrite the save data if we are in singleplayer or if we are the lan host, otherwise we would overwrite the server side save data!
         if (minecraft.getSingleplayerServer() == null) {
             BookUnlockStateManager.get().saveData = new BookStatesSaveData(
-                    new ConcurrentHashMap<>(Map.of(player.getUUID(), this.states)),
-                    new ConcurrentHashMap<>()
+                    Map.of(player.getUUID(), this.states),
+                    Object2ObjectMaps.emptyMap()
             );
         }
 
         //but firing the update event is fine :)
         if (BookGuiManager.get().openBookParentScreen != null) {
-            BookGuiManager.get().openBookParentScreen.onSyncBookUnlockCapabilityMessage(this);
+            BookGuiManager.get().openBookParentScreen.onSyncBookUnlockStatesMessage(this);
         }
     }
 }
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookVisualStatesMessage.java b/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookVisualStatesMessage.java
index 1a95cec50..6be63498d 100644
--- a/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookVisualStatesMessage.java
+++ b/common/src/main/java/com/klikli_dev/modonomicon/networking/SyncBookVisualStatesMessage.java
@@ -10,6 +10,8 @@
 import com.klikli_dev.modonomicon.bookstate.BookStatesSaveData;
 import com.klikli_dev.modonomicon.bookstate.BookVisualStateManager;
 import com.klikli_dev.modonomicon.bookstate.BookVisualStates;
+import com.klikli_dev.modonomicon.client.gui.BookGuiManager;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
@@ -18,7 +20,6 @@
 import net.minecraft.world.entity.player.Player;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class SyncBookVisualStatesMessage implements Message {
 
@@ -46,9 +47,14 @@ public void onClientReceived(Minecraft minecraft, Player player) {
         //we are not allowed to overwrite the save data if we are in singleplayer or if we are the lan host, otherwise we would overwrite the server side save data!
         if (minecraft.getSingleplayerServer() == null) {
             BookVisualStateManager.get().saveData = new BookStatesSaveData(
-                    new ConcurrentHashMap<>(),
-                    new ConcurrentHashMap<>(Map.of(player.getUUID(), this.states))
+                    Object2ObjectMaps.emptyMap(),
+                    Map.of(player.getUUID(), this.states)
             );
         }
+
+        //but firing the update event is fine :)
+        if (BookGuiManager.get().openBookEntryScreen != null) {
+            BookGuiManager.get().openBookEntryScreen.onSyncBookVisualStatesMessage(this);
+        }
     }
 }
diff --git a/common/src/main/resources/assets/modonomicon/textures/gui/book_overview.png b/common/src/main/resources/assets/modonomicon/textures/gui/book_overview.png
index 1cd2be22a7940d4e9cf8e094b59ec201b4214156..7367f7230b95ec0785f2a4ae8b0e7ff885177c39 100644
GIT binary patch
literal 1578
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
R_`6h{4(%tp*WyE{{{oAC>68Ef

literal 5829
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
D<(Zo`

diff --git a/fabric/src/main/java/com/klikli_dev/modonomicon/network/Networking.java b/fabric/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
index 1a9de6bf8..fc0687fc8 100644
--- a/fabric/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
+++ b/fabric/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
@@ -23,6 +23,8 @@ public static void registerReceivers() {
         ServerPlayNetworking.registerGlobalReceiver(ReloadResourcesDoneMessage.TYPE, new ServerMessageHandler<>());
         ServerPlayNetworking.registerGlobalReceiver(RequestSyncBookStatesMessage.TYPE, new ServerMessageHandler<>());
         ServerPlayNetworking.registerGlobalReceiver(RequestAdvancementMessage.TYPE, new ServerMessageHandler<>());
+        ServerPlayNetworking.registerGlobalReceiver(AddBookmarkMessage.TYPE, new ServerMessageHandler<>());
+        ServerPlayNetworking.registerGlobalReceiver(RemoveBookmarkMessage.TYPE, new ServerMessageHandler<>());
     }
 
     public static void registerMessages() {
@@ -37,6 +39,8 @@ public static void registerMessages() {
         PayloadTypeRegistry.playC2S().register(ReloadResourcesDoneMessage.TYPE, ReloadResourcesDoneMessage.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(RequestSyncBookStatesMessage.TYPE, RequestSyncBookStatesMessage.STREAM_CODEC);
         PayloadTypeRegistry.playC2S().register(RequestAdvancementMessage.TYPE, RequestAdvancementMessage.STREAM_CODEC);
+        PayloadTypeRegistry.playC2S().register(AddBookmarkMessage.TYPE, AddBookmarkMessage.STREAM_CODEC);
+        PayloadTypeRegistry.playC2S().register(RemoveBookmarkMessage.TYPE, RemoveBookmarkMessage.STREAM_CODEC);
 
         //to client
         PayloadTypeRegistry.playS2C().register(SendUnlockCodeToClientMessage.TYPE, SendUnlockCodeToClientMessage.STREAM_CODEC);
diff --git a/forge/src/main/java/com/klikli_dev/modonomicon/network/Networking.java b/forge/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
index de3cd41ae..15aa3ff47 100644
--- a/forge/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
+++ b/forge/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
@@ -166,6 +166,18 @@ public static void registerMessages() {
                 .decoder(decoder(RequestSyncBookStatesMessage.STREAM_CODEC))
                 .consumerNetworkThread((BiConsumer<RequestSyncBookStatesMessage, CustomPayloadEvent.Context>) MessageHandler::handle)
                 .add();
+
+        INSTANCE.messageBuilder(AddBookmarkMessage.class)
+                .encoder(encoder(AddBookmarkMessage.STREAM_CODEC))
+                .decoder(decoder(AddBookmarkMessage.STREAM_CODEC))
+                .consumerNetworkThread((BiConsumer<AddBookmarkMessage, CustomPayloadEvent.Context>) MessageHandler::handle)
+                .add();
+
+        INSTANCE.messageBuilder(RemoveBookmarkMessage.class)
+                .encoder(encoder(RemoveBookmarkMessage.STREAM_CODEC))
+                .decoder(decoder(RemoveBookmarkMessage.STREAM_CODEC))
+                .consumerNetworkThread((BiConsumer<RemoveBookmarkMessage, CustomPayloadEvent.Context>) MessageHandler::handle)
+                .add();
     }
 
     public static <T> void sendToSplit(ServerPlayer player, T message) {
diff --git a/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
index 7da587560..88fca8d17 100644
--- a/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
+++ b/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.21	2024-06-15T20:34:29.7311101	Languages: en_us
-dbd6b0627e6448e2df2ca44b3da68ed7e141ddda assets/modonomicon/lang/en_us.json
+// 1.21	2024-06-17T09:32:43.7732801	Languages: en_us
+5e9bca31739f981be8d1893d1091664494280f6a assets/modonomicon/lang/en_us.json
diff --git a/neo/src/generated/resources/assets/modonomicon/lang/en_us.json b/neo/src/generated/resources/assets/modonomicon/lang/en_us.json
index 695d2896b..d514a0291 100644
--- a/neo/src/generated/resources/assets/modonomicon/lang/en_us.json
+++ b/neo/src/generated/resources/assets/modonomicon/lang/en_us.json
@@ -132,7 +132,12 @@
   "modonomicon.command.success.save_progress": "Saved progress for book: %s. The unlock code has been copied to your clipboard.",
   "modonomicon.command.test_command.success": "You got an apple, because reading is cool!",
   "modonomicon.command.test_command2.success": "You got wheat, because clicking is cool!",
+  "modonomicon.gui.add_bookmark": "Add Bookmark",
   "modonomicon.gui.book.index_list_title": "Categories",
+  "modonomicon.gui.bookmarks.entry_list_title": "Bookmark Entries",
+  "modonomicon.gui.bookmarks.info": "To navigate to a bookmark, click on it in this list.\n\\\n\\\nTo add a bookmark, open an entry and click the \"Add Bookmark\" button on the bottom right.\n\\\n\\\nTo remove a bookmark, navigate to it and click the \"Remove Bookmark\" button on the bottom right.\n",
+  "modonomicon.gui.bookmarks.no_results": "No entries yet.",
+  "modonomicon.gui.bookmarks.screen.title": "Bookmarks",
   "modonomicon.gui.button.back": "Back",
   "modonomicon.gui.button.back.tooltip": "Go back to the last page you visited",
   "modonomicon.gui.button.exit": "Exit",
@@ -160,9 +165,11 @@
   "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.no_errors_found": "No errors found. You should not see this page!",
+  "modonomicon.gui.open_bookmarks": "Open Bookmarks",
   "modonomicon.gui.open_search": "Open Search",
   "modonomicon.gui.page.entity.loading_error": "Failed to load entity",
   "modonomicon.gui.recipe_page.recipe_missing": "Recipe %s was not found! This may be an issue with the mod, or the modpack may have disabled it.",
+  "modonomicon.gui.remove_bookmark": "Remove Bookmark",
   "modonomicon.gui.search.entry.locked": "(Locked)",
   "modonomicon.gui.search.entry_list_title": "Entries",
   "modonomicon.gui.search.info": "To search for entries, simply start typing what you are looking for.\n",
diff --git a/neo/src/main/java/com/klikli_dev/modonomicon/network/Networking.java b/neo/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
index 9d7bbe900..52b30fa58 100644
--- a/neo/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
+++ b/neo/src/main/java/com/klikli_dev/modonomicon/network/Networking.java
@@ -26,7 +26,9 @@ public static void register(final RegisterPayloadHandlersEvent event) {
         registrar.playToServer(ReloadResourcesDoneMessage.TYPE, ReloadResourcesDoneMessage.STREAM_CODEC, MessageHandler::handle);
         registrar.playToServer(RequestSyncBookStatesMessage.TYPE, RequestSyncBookStatesMessage.STREAM_CODEC, MessageHandler::handle);
         registrar.playToServer(RequestAdvancementMessage.TYPE, RequestAdvancementMessage.STREAM_CODEC, MessageHandler::handle);
-        registrar.playToClient(SendUnlockCodeToServerMessage.TYPE, SendUnlockCodeToServerMessage.STREAM_CODEC, MessageHandler::handle);
+        registrar.playToServer(SendUnlockCodeToServerMessage.TYPE, SendUnlockCodeToServerMessage.STREAM_CODEC, MessageHandler::handle);
+        registrar.playToServer(AddBookmarkMessage.TYPE, AddBookmarkMessage.STREAM_CODEC, MessageHandler::handle);
+        registrar.playToServer(RemoveBookmarkMessage.TYPE, RemoveBookmarkMessage.STREAM_CODEC, MessageHandler::handle);
 
         registrar.playToClient(SendUnlockCodeToClientMessage.TYPE, SendUnlockCodeToClientMessage.STREAM_CODEC, MessageHandler::handle);
         registrar.playToClient(SendAdvancementToClientMessage.TYPE, SendAdvancementToClientMessage.STREAM_CODEC, MessageHandler::handle);
@@ -35,6 +37,8 @@ public static void register(final RegisterPayloadHandlersEvent event) {
         registrar.playToClient(SyncBookVisualStatesMessage.TYPE, SyncBookVisualStatesMessage.STREAM_CODEC, MessageHandler::handle);
         registrar.playToClient(SyncMultiblockDataMessage.TYPE, SyncMultiblockDataMessage.STREAM_CODEC, MessageHandler::handle);
         registrar.playToClient(ReloadResourcesOnClientMessage.TYPE, ReloadResourcesOnClientMessage.STREAM_CODEC, MessageHandler::handle);
+
+
     }
 
     public static <T extends Message> void sendToSplit(ServerPlayer player, T message) {