Index owned content recipes for book placement

crates/horizon-client/src/recipe_book.rs

@@ -720,8 +720,8 @@ pub(crate) fn crafting_station(kind: &str) -> &'static str {
     }
 }
 impl RecipeIndex {
-    /// Reads `data/minecraft/recipe/*.json` under `root`, with the world's
-    /// packs' recipe files over it (`overlay`).
+    /// Reads vanilla and content namespaces' recipes under `root`, with
+    /// the world's packs' recipe files over them (`overlay`).
     pub fn load(root: &std::path::Path, overlay: &PackOverlay) -> Self {
         let mut recipes = std::collections::BTreeMap::new();
         let mut insert = |id: String, v: &serde_json::Value| {
@@ -786,6 +786,19 @@ impl RecipeIndex {
                 Some((format!("minecraft:{}", file.name), v))
             })
             .collect();
+        for namespace in crate::mod_content::namespaces(root) {
+            if namespace == "minecraft" {
+                continue;
+            }
+            if let Ok(folder) =
+                crate::json_folder::read(&root.join(format!("data/{namespace}/recipe")))
+            {
+                sources.extend(folder.files.iter().filter_map(|file| {
+                    let v = serde_json::from_slice::<serde_json::Value>(file.bytes().ok()?).ok()?;
+                    Some((format!("{namespace}:{}", file.name), v))
+                }));
+            }
+        }
         for (id, files) in overlay.kind("recipe") {
             match serde_json::from_slice::<serde_json::Value>(PackOverlay::top(files)) {
                 Ok(v) => match sources.iter_mut().find(|(n, _)| n == id) {
@@ -1175,6 +1188,54 @@ mod tests {
             (Some("minecraft:smithing_table"), None)
         );
     }
+    #[test]
+    fn content_namespace_recipes_have_display_ids() {
+        let root = std::env::temp_dir().join(format!(
+            "horizon-mod-recipe-index-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap()
+                .as_nanos()
+        ));
+        let vanilla = root.join("data/minecraft/recipe");
+        let content = root.join("data/recipe_pilot/recipe");
+        std::fs::create_dir_all(&vanilla).unwrap();
+        std::fs::create_dir_all(&content).unwrap();
+        for marker in [
+            horizon_items::content_namespaces::MARKER,
+            horizon_items::content_namespaces::MOD_IDS_MARKER,
+        ] {
+            std::fs::write(root.join(marker), br#"["recipe_pilot"]"#).unwrap();
+        }
+        std::fs::write(
+            vanilla.join("control.json"),
+            br#"{"type":"minecraft:crafting_shapeless","result":{"id":"minecraft:stick"}}"#,
+        )
+        .unwrap();
+        std::fs::write(
+            content.join("flint_to_echo_shard.json"),
+            br#"{"type":"minecraft:crafting_shapeless","ingredients":["minecraft:flint"],"result":{"id":"minecraft:echo_shard","count":2}}"#,
+        )
+        .unwrap();
+        std::fs::write(
+            content.join("gated.json"),
+            br#"{"type":"minecraft:crafting_shapeless","neoforge:conditions":[{"type":"neoforge:mod_loaded","modid":"absent"}],"result":{"id":"minecraft:diamond"}}"#,
+        )
+        .unwrap();
+        let index = RecipeIndex::load(&root, &PackOverlay::NONE);
+        std::fs::remove_dir_all(&root).unwrap();
+        let id = "recipe_pilot:flint_to_echo_shard";
+        let display = index
+            .first_display(id)
+            .expect("content recipe has a display ID");
+        assert!(display >= 0);
+        assert_eq!(index.recipe_of_display(display), Some(id));
+        assert_eq!(index.result(id), Some("minecraft:echo_shard"));
+        assert!(index.first_display("minecraft:control").is_some());
+        assert!(!index.contains("recipe_pilot:gated"));
+    }
+
     #[test]
     fn small_recipes_are_centred_in_the_grid() {
         // One ingredient in a 3x3 grid goes to the middle cell.

tools/lan_e2e.py

@@ -13141,7 +13141,9 @@ def check_recipes_hmod(host, guest, out):
         assert fields, f'{game.name}: no Recipes search field (mod absent or empty-search recovery failed)'
         # The native panel is to the right of the vanilla recipe book's search field.
         field = max(fields, key=lambda w: w['bounds'][0])
-        game.raw('click', field['id'])
+        x, y, width, height = field['bounds']
+        # Clicking the centre can leave a suffix to the right of the cursor.
+        game.raw('click-at', x + width - 1, y + height / 2)
         # `key` drives key bindings; `type` drives this focused edit box, including backspace.
         game.script([r"type '\b'"] * 50 + [f'type {text}'])
         game.wait(5)