Add recipe type mapping as a ServiceLoader interface, and fix a searc…

…h issue.

docs/docs/changelog.md

@@ -1,6 +1,11 @@
 
 # Changelog
 
+## 2.5.0
+
+- Added an extension point for mods to add support for [custom recipe types](./integration/recipe-types.md) to all guides.
+- Fixed an issue with navigating to the search screen.
+
 ## 2.4.0
 
 - Add missing Markdown node classes to API jar

docs/docs/integration/recipe-types.md

@@ -0,0 +1,40 @@
+# Custom Recipe Types
+
+## Registering Custom Recipe Types
+
+To display your custom recipe types in mods, you can implement
+the [RecipeTypeMappingSupplier](https://guideme.appliedenergistics.org/javadoc/guideme/compiler/tags/RecipeTypeMappingSupplier.html).
+
+While it can be added to guides using the standard GuideME extension mechanism, this interface can also be
+exposed as a Java ServiceLoader service, which enables its use in all guides.
+
+This is important since your recipe types can show up in other guides through the use of data packs.
+
+The following example adds custom recipe layout implementations for the AE2 custom recipe types.
+You do not need to use a custom block subclass necessarily, since `RecipeTypeMappings` just expects a
+factory of the form `Function<RecipeHolder<T>, LytBlock>` for each recipe type.
+
+```java
+package appeng.client.guidebook;
+
+// ...
+
+public class RecipeTypeContributions implements RecipeTypeMappingSupplier {
+    @Override
+    public void collect(RecipeTypeMappings mappings) {
+        mappings.add(AERecipeTypes.INSCRIBER, LytInscriberRecipe::new);
+        mappings.add(AERecipeTypes.CHARGER, LytChargerRecipe::new);
+        mappings.add(AERecipeTypes.TRANSFORM, LytTransformRecipe::new);
+    }
+}
+```
+
+To make GuideME load this extension, add its fully qualified class name to a file with the following path in your
+project:
+`src/main/resources/META-INF/services/guideme.compiler.tags.RecipeTypeMappingSupplier`.
+
+## Custom Layout Blocks
+
+If your recipe requires a custom layout block, you can use the
+existing [recipe layouts in GuideME](https://github.com/AppliedEnergistics/GuideME/tree/main/src/main/java/guideme/document/block/recipes)
+as a starting point.

docs/docusaurus.config.ts

@@ -102,6 +102,7 @@ const config: Config = {
     prism: {
       theme: prismThemes.github,
       darkTheme: prismThemes.dracula,
+      additionalLanguages: ["java", "scala"],
     },
   } satisfies Preset.ThemeConfig,
 };

src/main/java/guideme/compiler/tags/RecipeTypeMappingSupplier.java

@@ -12,6 +12,10 @@
 /**
  * Allows mods to register mappings between recipe type and their custom recipe blocks for use in {@code <RecipeFor/>}
  * and similar tags.
+ * <p/>
+ * **NOTE:** In addition to being an extension point, implementations of this interface are also retrieved through the
+ * Java Service-Loader to enable use of mod recipes cross-guide. Specific instances registered through
+ * {@link guideme.GuideBuilder#extension} will have higher priority than instances discovered through service-loader.
  */
 public interface RecipeTypeMappingSupplier extends Extension {
     ExtensionPoint<RecipeTypeMappingSupplier> EXTENSION_POINT = new ExtensionPoint<>(RecipeTypeMappingSupplier.class);

src/main/java/guideme/internal/screen/GuideNavigation.java

@@ -32,6 +32,14 @@ public static void navigateTo(Guide guide, PageAnchor anchor) {
             screenToReturnTo = searchScreen.getReturnToOnClose();
         }
 
+        // Handle built-in pages
+        if (GuideSearchScreen.PAGE_ID.equals(anchor.pageId())) {
+            var guiScreen = GuideSearchScreen.open(guide, anchor.anchor());
+            guiScreen.setReturnToOnClose(screenToReturnTo);
+            Minecraft.getInstance().setScreen(guiScreen);
+            return;
+        }
+
         // Handle navigation within the same guide
         if (currentScreen instanceof GuideScreen guideScreen && guideScreen.getGuide() == guide) {
             if (Objects.equals(guideScreen.getCurrentPageId(), anchor.pageId())) {
@@ -45,14 +53,6 @@ public static void navigateTo(Guide guide, PageAnchor anchor) {
             return;
         }
 
-        // Handle built-in pages
-        if (GuideSearchScreen.PAGE_ID.equals(anchor.pageId())) {
-            var guiScreen = GuideSearchScreen.open(guide, anchor.anchor());
-            guiScreen.setReturnToOnClose(screenToReturnTo);
-            Minecraft.getInstance().setScreen(guiScreen);
-            return;
-        }
-
         GuideScreen guideScreen = GuideScreen.openNew(guide, anchor, history);
         guideScreen.setReturnToOnClose(screenToReturnTo);
         Minecraft.getInstance().setScreen(guideScreen);