Add optional TerraBlender biome integration and cave biome pages (#37)

src/main/java/net/dnorberg/rivencraft/block/entity/BookBinderBlockEntity.java

@@ -25,7 +25,6 @@ import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.dnorberg.rivencraft.book.AgeBiomeSelection;
 import net.dnorberg.rivencraft.book.AgeFeatureSelection;
-import net.minecraft.tags.BiomeTags;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -163,8 +162,8 @@ public final class BookBinderBlockEntity extends BlockEntity implements Containe
                         if (holder.isEmpty()) {
                             diagnostics.add(new WritingGrammar.Diagnostic(WritingGrammar.Code.UNKNOWN_BIOME,
                                     symbol.index(), "Restore biome " + id + " or remove this page"));
-                        } else if (cave && !holder.orElseThrow().is(AgeBiomeSelection.CAVE_BIOMES)
-                                && !holder.orElseThrow().is(BiomeTags.IS_NETHER)) {
+                        } else if (cave && !AgeBiomeSelection.isCaveBiome(level.registryAccess(),
+                                holder.orElseThrow())) {
                             diagnostics.add(new WritingGrammar.Diagnostic(WritingGrammar.Code.UNSUPPORTED_BIOME,
                                     symbol.index(), "Cave Ages require cave or Nether biomes; remove " + id));
                         }

src/main/java/net/dnorberg/rivencraft/block/entity/InkMixerBlockEntity.java

@@ -9,7 +9,6 @@ import net.dnorberg.rivencraft.writing.InkModifierIngredients;
 import net.dnorberg.rivencraft.registry.ModBlockEntities;
 import net.dnorberg.rivencraft.registry.ModDataComponents;
 import net.dnorberg.rivencraft.registry.ModItems;
-import net.dnorberg.rivencraft.writing.WritingInkService;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
@@ -127,14 +126,13 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
 
     public boolean canCreateLinkPanel() {
         if (!items.get(PAPER).is(Items.PAPER)) return false;
-        int cost = WritingInkService.linkPanelCost();
-        return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, cost);
+        return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, InkVialItem.CAPACITY);
     }
 
     /** Commit inputs only when a virtual output is actually taken. */
     public boolean consumeLinkPanelMaterials() {
         if (!canCreateLinkPanel()) return false;
-        int cost = WritingInkService.linkPanelCost();
+        int cost = InkVialItem.CAPACITY;
         if (inkRemaining < cost) {
             inkRemaining += InkVialExchange.exchange(items, INK, BOTTLES);
         }

src/main/java/net/dnorberg/rivencraft/book/AgeBiomeSelection.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 import net.dnorberg.rivencraft.Rivencraft;
+import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
 import net.dnorberg.rivencraft.writing.SymbolSemantics;
 import net.dnorberg.rivencraft.writing.WritingGrammar;
 import net.minecraft.core.Holder;
@@ -59,9 +60,10 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
         for (ResourceLocation id : authored) {
             Holder.Reference<Biome> holder = registry.get(ResourceKey.create(Registries.BIOME, id))
                     .orElseThrow(() -> new IllegalArgumentException("Unknown biome " + id + "; restore its data pack or remove its page"));
-            if (cave && !holder.is(CAVE_BIOMES) && !holder.is(BiomeTags.IS_NETHER)) {
+            if (cave && !isCaveBiome(registries, holder)) {
                 throw new IllegalArgumentException("Biome " + id
-                        + " is not a cave or Nether biome; use #rivencraft:cave_biomes or #minecraft:is_nether");
+                        + " is not a cave or Nether biome; use #rivencraft:cave_biomes, #minecraft:is_nether,"
+                        + " or a TerraBlender Nether region");
             }
         }
         List<ResourceLocation> availableBiomes = eligible(registries, profile);
@@ -69,15 +71,16 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
         if (distribution == AgeTraits.BiomeDistribution.NATIVE) {
             if (!authored.isEmpty()) throw new IllegalArgumentException("Native biome distribution cannot use biome pages");
             return new AgeBiomeSelection(distribution, profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
-                    ? List.of(ResourceLocation.withDefaultNamespace("plains")) : availableBiomes);
+                    ? List.of(ResourceLocation.withDefaultNamespace("plains"))
+                    : isCave(profile) ? availableBiomes : presetBiomes(registries, profile));
         }
         List<ResourceLocation> selected = new ArrayList<>(authored);
         Set<ResourceLocation> distinct = new LinkedHashSet<>(selected);
         int minimum = minimum(distribution);
         int target = minimum;
         if (authored.isEmpty()) {
-            // The terrain's available pool is the upper bound. For Cave terrain,
-            // eligible() returns the cave tag; other terrains use their preset.
+            // The terrain's available pool is the upper bound, including any
+            // compatible TerraBlender region biomes present at creation time.
             int availableBiomeCount = new LinkedHashSet<>(availableBiomes).size();
             int maximum = distribution == AgeTraits.BiomeDistribution.SINGLE ? 1 : availableBiomeCount;
             if (maximum >= minimum) {
@@ -102,14 +105,26 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
         if (isCave(profile)) {
             List<ResourceLocation> tagged = registry.listElements().filter(holder -> holder.is(CAVE_BIOMES))
                     .map(holder -> holder.key().location()).sorted().toList();
-            if (!tagged.isEmpty()) return tagged;
-            return List.of("minecraft:deep_dark", "minecraft:dripstone_caves", "minecraft:lush_caves")
+            List<ResourceLocation> vanilla = !tagged.isEmpty() ? tagged : List.of("minecraft:deep_dark", "minecraft:dripstone_caves", "minecraft:lush_caves")
                     .stream().map(ResourceLocation::parse)
                     .filter(id -> registry.get(ResourceKey.create(Registries.BIOME, id)).isPresent()).toList();
+            List<ResourceLocation> nether = registry.listElements().filter(holder -> holder.is(BiomeTags.IS_NETHER))
+                    .map(holder -> holder.key().location()).toList();
+            return merge(merge(vanilla, nether), TerraBlenderBiomes.nether(registries));
         }
         if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
             return List.of(ResourceLocation.withDefaultNamespace("the_void"));
         }
+        ResourceLocation preset = profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
+                ? ResourceLocation.withDefaultNamespace("overworld") : profile.biomePreset();
+        List<ResourceLocation> nativeBiomes = presetBiomes(registries, profile);
+        return merge(nativeBiomes, preset.equals(ResourceLocation.withDefaultNamespace("nether"))
+                ? TerraBlenderBiomes.nether(registries) : TerraBlenderBiomes.overworld(registries));
+    }
+
+    private static List<ResourceLocation> presetBiomes(RegistryAccess registries, AgeRuntimeProfile profile) {
+        if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
+            return List.of(ResourceLocation.withDefaultNamespace("the_void"));
         ResourceLocation preset = profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
                 ? ResourceLocation.withDefaultNamespace("overworld") : profile.biomePreset();
         var parameters = registries.lookupOrThrow(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST)
@@ -119,6 +134,15 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
                 .sorted(Comparator.naturalOrder()).toList();
     }
 
+    public static boolean isCaveBiome(RegistryAccess registries, Holder.Reference<Biome> holder) {
+        return holder.is(CAVE_BIOMES) || holder.is(BiomeTags.IS_NETHER)
+                || TerraBlenderBiomes.nether(registries).contains(holder.key().location());
+    }
+
+    private static List<ResourceLocation> merge(List<ResourceLocation> vanilla, List<ResourceLocation> additions) {
+        return java.util.stream.Stream.concat(vanilla.stream(), additions.stream()).distinct().sorted().toList();
+    }
+
     public static boolean isCave(AgeRuntimeProfile profile) {
         return profile.terrain() == AgeRuntimeProfile.Terrain.NOISE
                 && profile.noiseSettings().equals(ResourceLocation.withDefaultNamespace("caves"));

src/main/java/net/dnorberg/rivencraft/book/EnvironmentWritingGameTests.java

@@ -1,12 +1,10 @@
 package net.dnorberg.rivencraft.book;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import net.dnorberg.rivencraft.item.PageItem;
-import net.dnorberg.rivencraft.registry.ModCreativeTabs;
 import net.dnorberg.rivencraft.writing.OrderedWriting;
 import net.dnorberg.rivencraft.writing.PageContent;
 import net.dnorberg.rivencraft.writing.SymbolCatalog;
@@ -26,38 +24,23 @@ public final class EnvironmentWritingGameTests {
     private EnvironmentWritingGameTests() {}
 
     @GameTest(template = "empty")
-    public static void symbolCategoriesPartitionCreativePages(GameTestHelper helper) {
+    public static void caveBiomesHaveSeparateCreativePages(GameTestHelper helper) {
         var registries = helper.getLevel().registryAccess();
-        var allPages = PageItem.creativeSymbolPages(registries);
-        Set<ResourceLocation> collected = new HashSet<>();
-        helper.assertTrue(ModCreativeTabs.SYMBOL_PAGES.keySet().containsAll(PageItem.bundledCreativeCategories()),
-                "Every bundled page category must receive a creative tab");
-        for (ResourceLocation category : PageItem.bundledCreativeCategories()) {
-            var categoryPages = PageItem.creativeSymbolPages(registries, category);
-            helper.assertFalse(categoryPages.isEmpty(), "Every category tab must contain pages: " + category);
-            for (var page : categoryPages) {
-                helper.assertValueEqual(PageItem.creativeCategory(page), category,
-                        "Category tabs must not mix symbol pages");
-                helper.assertTrue(collected.add(PageItem.content(page).symbol().orElseThrow().id()),
-                        "A symbol page must appear in exactly one category tab");
-            }
-        }
-        helper.assertValueEqual(collected.size(), allPages.size(),
-                "Category tabs must contain every bundled and generated biome page");
         var biomePages = PageItem.creativeSymbolPages(registries,
                 ResourceLocation.fromNamespaceAndPath("rivencraft", "biome"));
-        var generationPages = PageItem.creativeSymbolPages(registries,
-                ResourceLocation.fromNamespaceAndPath("rivencraft", "biome_generation"));
+        var cavePages = PageItem.creativeSymbolPages(registries,
+                ResourceLocation.fromNamespaceAndPath("rivencraft", "cave_biome"));
+        helper.assertTrue(PageItem.bundledCreativeCategories().contains(
+                ResourceLocation.fromNamespaceAndPath("rivencraft", "cave_biome")),
+                "The cave biome creative tab must be registered");
         helper.assertTrue(biomePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
                         .id().getPath().equals("biome/desert")), "Biome pages must remain in the Biome tab");
+        helper.assertTrue(cavePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
+                        .id().getPath().equals("biome/lush_caves")), "Cave biomes need their own tab");
+        helper.assertTrue(cavePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
+                        .id().getPath().equals("biome/crimson_forest")), "Nether biomes belong in the Cave tab");
         helper.assertFalse(biomePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
-                        .id().getPath().equals("biome/tiny")), "Biome generation types must leave the Biome tab");
-        helper.assertTrue(generationPages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
-                        .id().getPath().equals("biome/tiny")), "Biome generation types need their own tab");
-        helper.assertTrue(allPages.stream().noneMatch(page -> PageItem.content(page).kind() == PageContent.Kind.BLANK),
-                "Blank pages must not enter the creative or JEI symbol-page feed");
-        helper.assertValueEqual(PageItem.content(PageItem.createLinkPanelPage()).kind(), PageContent.Kind.LINK_PANEL,
-                "Link pages must stay separate from symbol categories");
+                        .id().getPath().equals("biome/lush_caves")), "Cave biomes must leave the general Biome tab");
         helper.succeed();
     }
 

src/main/java/net/dnorberg/rivencraft/compat/TerraBlenderBiomes.java

@@ -0,0 +1,33 @@
+package net.dnorberg.rivencraft.compat;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import net.dnorberg.rivencraft.Rivencraft;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.ResourceLocation;
+import net.neoforged.fml.ModList;
+
+/** Optional boundary: core Age code never loads TerraBlender API classes. */
+public final class TerraBlenderBiomes {
+    private static final AtomicBoolean WARNED = new AtomicBoolean();
+    private TerraBlenderBiomes() {}
+
+    public static List<ResourceLocation> overworld(RegistryAccess registries) {
+        return collect(registries, false);
+    }
+
+    public static List<ResourceLocation> nether(RegistryAccess registries) {
+        return collect(registries, true);
+    }
+
+    private static List<ResourceLocation> collect(RegistryAccess registries, boolean nether) {
+        if (!ModList.get().isLoaded("terrablender")) return List.of();
+        try {
+            return TerraBlenderRegionAdapter.collect(registries, nether);
+        } catch (RuntimeException | LinkageError exception) {
+            if (WARNED.compareAndSet(false, true))
+                Rivencraft.LOGGER.warn("TerraBlender biome regions could not be read; using Rivencraft's biome pool", exception);
+            return List.of();
+        }
+    }
+}

src/main/java/net/dnorberg/rivencraft/compat/TerraBlenderRegionAdapter.java

@@ -0,0 +1,34 @@
+package net.dnorberg.rivencraft.compat;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.biome.Biome;
+import terrablender.api.Region;
+import terrablender.api.RegionType;
+import terrablender.api.Regions;
+
+/** Loaded only after the optional TerraBlender mod is confirmed present. */
+final class TerraBlenderRegionAdapter {
+    private TerraBlenderRegionAdapter() {}
+
+    static List<ResourceLocation> collect(RegistryAccess registries, boolean nether) {
+        var biomes = registries.registryOrThrow(Registries.BIOME);
+        RegionType type = nether ? RegionType.NETHER : RegionType.OVERWORLD;
+        Set<ResourceLocation> ids = new LinkedHashSet<>();
+        for (Region region : Regions.get(type)) {
+            region.addBiomes(biomes, mapping -> {
+                ResourceKey<Biome> key = mapping.getSecond();
+                ResourceLocation id = key.location();
+                // Vanilla's default region is always present. Only additions from
+                // other mods extend an Age's existing deterministic biome pool.
+                if (!id.getNamespace().equals("minecraft") && biomes.containsKey(id)) ids.add(id);
+            });
+        }
+        return ids.stream().sorted().toList();
+    }
+}

src/main/java/net/dnorberg/rivencraft/gametest/CoreGameTests.java

@@ -1,8 +1,10 @@
 package net.dnorberg.rivencraft.gametest;
 
 import net.dnorberg.rivencraft.Rivencraft;
+import net.dnorberg.rivencraft.writing.BiomeSymbolPages;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.resources.ResourceLocation;
 import net.neoforged.neoforge.gametest.GameTestHolder;
 import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
 
@@ -92,6 +94,16 @@ public final class CoreGameTests {
         BookBinderGameTests.panelOnlyBookRetainsApplicableModifiers(helper);
     }
 
+    @GameTest(template = "empty")
+    public static void biomePageNamespaces(GameTestHelper helper) {
+        helper.assertValueEqual(BiomeSymbolPages.symbolId(ResourceLocation.parse("minecraft:desert")),
+                ResourceLocation.parse("rivencraft:biome/desert"), "Vanilla biome page IDs must remain stable");
+        helper.assertFalse(BiomeSymbolPages.symbolId(ResourceLocation.parse("example:orchard"))
+                        .equals(BiomeSymbolPages.symbolId(ResourceLocation.parse("another:orchard"))),
+                "Equal biome paths from different mods must not share a page ID");
+        helper.succeed();
+    }
+
     @GameTest(template = "empty")
     public static void binderRejectsConflictingGrammar(GameTestHelper helper) {
         BookBinderGameTests.conflictingGrammarKeepsBinderInputsRecoverable(helper);

src/main/java/net/dnorberg/rivencraft/gametest/InkMixerGameTests.java

@@ -4,7 +4,6 @@ import net.dnorberg.rivencraft.block.entity.InkMixerBlockEntity;
 import net.dnorberg.rivencraft.menu.InkMixerMenu;
 import net.dnorberg.rivencraft.registry.ModBlocks;
 import net.dnorberg.rivencraft.registry.ModItems;
-import net.dnorberg.rivencraft.writing.WritingInkService;
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.gametest.framework.GameTestHelper;
@@ -111,8 +110,9 @@ public final class InkMixerGameTests {
         helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking result must give a Link Panel");
         helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
                 "Taking result must use exactly one paper");
-        helper.assertValueEqual(mixer.inkRemaining(), 16 - WritingInkService.linkPanelCost(),
-                "Taking result must spend the configured ink cost");
+        helper.assertValueEqual(mixer.inkRemaining(), 0,
+                "Taking one panel must spend the entire Ink Vial");
+        helper.assertFalse(mixer.canCreateLinkPanel(), "A second panel needs another Ink Vial");
         var saved = mixer.saveWithoutMetadata(helper.getLevel().registryAccess());
         var restored = new InkMixerBlockEntity(mixer.getBlockPos(), ModBlocks.INK_MIXER.get().defaultBlockState());
         restored.loadWithComponents(saved, helper.getLevel().registryAccess());
@@ -122,6 +122,24 @@ public final class InkMixerGameTests {
         helper.succeed();
     }
 
+    @GameTest(template = "empty")
+    public static void eachLinkPanelConsumesOneInkVial(GameTestHelper helper) {
+        InkMixerBlockEntity mixer = place(helper);
+        mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 3));
+        mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get(), 2));
+        helper.assertTrue(mixer.canCreateLinkPanel(), "First vial must enable the first panel");
+        helper.assertTrue(mixer.consumeLinkPanelMaterials(), "First panel must be produced");
+        helper.assertValueEqual(mixer.inkRemaining(), 16, "Second vial must refill after first panel");
+        helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.BOTTLES).getCount(), 2,
+                "Both spent vials must return bottles");
+        helper.assertTrue(mixer.consumeLinkPanelMaterials(), "Second panel must be produced");
+        helper.assertValueEqual(mixer.inkRemaining(), 0, "Second panel must use the whole second vial");
+        helper.assertFalse(mixer.canCreateLinkPanel(), "Two vials must not make a third panel");
+        helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
+                "Each panel must also use one paper");
+        helper.succeed();
+    }
+
     @GameTest(template = "empty")
     public static void bottleCapacityBlocksAndThenPermitsRefill(GameTestHelper helper) {
         InkMixerBlockEntity mixer = place(helper);

src/main/java/net/dnorberg/rivencraft/item/PageItem.java

@@ -11,7 +11,9 @@ import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import net.dnorberg.rivencraft.Rivencraft;
+import net.dnorberg.rivencraft.book.AgeBiomeSelection;
 import net.dnorberg.rivencraft.book.LinkProperties;
+import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
 import net.dnorberg.rivencraft.registry.ModDataComponents;
 import net.dnorberg.rivencraft.registry.ModItems;
 import net.dnorberg.rivencraft.writing.PageContent;
@@ -25,9 +27,11 @@ import net.dnorberg.rivencraft.writing.SymbolSemantics;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BiomeTags;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
@@ -36,6 +40,10 @@ import net.minecraft.world.item.TooltipFlag;
 public final class PageItem extends Item {
     private static final ResourceLocation BIOME_GENERATION_CATEGORY =
             ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome_generation");
+    private static final ResourceLocation CAVE_BIOME_CATEGORY =
+            ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "cave_biome");
+    private static final ResourceLocation BIOME_CATEGORY =
+            ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome");
     private static final Map<String, CreativeSymbol> CREATIVE_SYMBOLS = loadCreativeSymbols();
 
     private record CreativeSymbol(SymbolDisplayMetadata display, ResourceLocation creativeCategory) {}
@@ -62,10 +70,14 @@ public final class PageItem extends Item {
                 .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
         categories.add(BlockSymbolPages.CATEGORY);
         categories.add(BlockSymbolPages.FLUID_CATEGORY);
+        categories.add(CAVE_BIOME_CATEGORY);
         return List.copyOf(categories);
     }
 
     public static ItemStack bundledCreativeCategoryIcon(ResourceLocation category) {
+        if (category.equals(CAVE_BIOME_CATEGORY)) {
+            return createCreativeBiomePage(ResourceLocation.withDefaultNamespace("lush_caves"));
+        }
         if (category.equals(BlockSymbolPages.CATEGORY) || category.equals(BlockSymbolPages.FLUID_CATEGORY)) {
             return createCreativeBlockPage(ResourceLocation.withDefaultNamespace(
                     category.equals(BlockSymbolPages.FLUID_CATEGORY) ? "water" : "stone"));
@@ -90,8 +102,7 @@ public final class PageItem extends Item {
         Set<String> bundled = CREATIVE_SYMBOLS.keySet();
         registries.lookupOrThrow(Registries.BIOME).listElements()
                 .map(holder -> holder.key().location())
-                .filter(id -> id.getNamespace().equals("minecraft"))
-                .filter(id -> !bundled.contains("biome/" + id.getPath()))
+                .filter(id -> !bundled.contains(BiomeSymbolPages.symbolId(id).getPath()))
                 .sorted()
                 .forEach(id -> pages.add(createCreativeBiomePage(id)));
         return pages;
@@ -103,11 +114,34 @@ public final class PageItem extends Item {
             return BlockSymbolPages.availableBlocks(category).stream()
                     .map(PageItem::createCreativeBlockPage).toList();
         }
+        Set<ResourceLocation> caveBiomes = category.equals(BIOME_CATEGORY) || category.equals(CAVE_BIOME_CATEGORY)
+                ? caveBiomeIds(registries) : Set.of();
         return creativeBundledAndBiomePages(registries).stream()
-                .filter(page -> category.equals(creativeCategory(page)))
+                .filter(page -> category.equals(creativeCategory(page, caveBiomes)))
                 .toList();
     }
 
+    public static ResourceLocation creativeCategory(ItemStack page, HolderLookup.Provider registries) {
+        return creativeCategory(page, caveBiomeIds(registries));
+    }
+
+    private static ResourceLocation creativeCategory(ItemStack page, Set<ResourceLocation> caveBiomes) {
+        ResourceLocation category = creativeCategory(page);
+        if (!category.equals(BIOME_CATEGORY)) return category;
+        ResourceLocation symbolId = content(page).symbol().orElseThrow().id();
+        ResourceLocation biomeId = BiomeSymbolPages.biomeId(symbolId);
+        return caveBiomes.contains(biomeId) ? CAVE_BIOME_CATEGORY : category;
+    }
+
+    private static Set<ResourceLocation> caveBiomeIds(HolderLookup.Provider registries) {
+        LinkedHashSet<ResourceLocation> ids = new LinkedHashSet<>();
+        registries.lookupOrThrow(Registries.BIOME).listElements()
+                .filter(holder -> holder.is(AgeBiomeSelection.CAVE_BIOMES) || holder.is(BiomeTags.IS_NETHER))
+                .forEach(holder -> ids.add(holder.key().location()));
+        if (registries instanceof RegistryAccess access) ids.addAll(TerraBlenderBiomes.nether(access));
+        return ids;
+    }
+
     public static ResourceLocation creativeCategory(ItemStack page) {
         SymbolDisplayMetadata metadata = page.get(ModDataComponents.PAGE_SYMBOL_DISPLAY.get());
         if (metadata == null) throw new IllegalArgumentException("Page has no symbol display metadata");

src/main/java/net/dnorberg/rivencraft/registry/ModCreativeTabs.java

@@ -42,7 +42,7 @@ public final class ModCreativeTabs {
                     .build());
 
     private static final List<String> CATEGORY_ORDER = List.of(
-            "terrain", "biome", "biome_generation", "weather", "lighting", "sky", "celestial", "block", "fluid", "feature");
+            "terrain", "biome", "cave_biome", "biome_generation", "weather", "lighting", "sky", "celestial", "block", "fluid", "feature");
 
     public static final Map<ResourceLocation, DeferredHolder<CreativeModeTab, CreativeModeTab>> SYMBOL_PAGES =
             registerSymbolPageTabs();

src/main/java/net/dnorberg/rivencraft/writing/BiomeSymbolPages.java

@@ -6,14 +6,27 @@ import java.util.Optional;
 import net.dnorberg.rivencraft.Rivencraft;
 import net.minecraft.resources.ResourceLocation;
 
-/** Built-in fallback pages for registered vanilla biomes without hand-authored symbol JSON. */
+/** Registry-derived pages for biomes without hand-authored symbol JSON. */
 public final class BiomeSymbolPages {
     private static final ResourceLocation CATEGORY = ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome");
 
     private BiomeSymbolPages() { }
 
     public static ResourceLocation symbolId(ResourceLocation biomeId) {
-        return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome/" + biomeId.getPath());
+        // Preserve old vanilla page IDs, while keeping modded namespaces distinct.
+        return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome/"
+                + (biomeId.getNamespace().equals("minecraft") ? "" : biomeId.getNamespace() + "/")
+                + biomeId.getPath());
+    }
+
+    public static ResourceLocation biomeId(ResourceLocation symbolId) {
+        String path = symbolId.getPath();
+        if (!symbolId.getNamespace().equals(Rivencraft.MOD_ID) || !path.startsWith("biome/"))
+            throw new IllegalArgumentException("Not a biome symbol: " + symbolId);
+        path = path.substring("biome/".length());
+        int separator = path.indexOf('/');
+        return separator < 0 ? ResourceLocation.withDefaultNamespace(path)
+                : ResourceLocation.fromNamespaceAndPath(path.substring(0, separator), path.substring(separator + 1));
     }
 
     public static SymbolDefinition definition(ResourceLocation biomeId) {
@@ -24,8 +37,11 @@ public final class BiomeSymbolPages {
                 .map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
                 .reduce("", String::concat);
         if (glyphWord.isEmpty()) glyphWord = "World";
+        if (glyphWord.length() > 48) glyphWord = glyphWord.substring(0, 48);
         return new SymbolDefinition(SymbolDefinition.CURRENT_SCHEMA_VERSION,
-                "symbol.rivencraft.biome." + path,
+                biomeId.getNamespace().equals("minecraft")
+                        ? "symbol.rivencraft.biome." + path
+                        : "biome." + biomeId.getNamespace() + "." + path.replace('/', '.'),
                 "symbol.rivencraft.biome.generated.description",
                 CATEGORY,
                 Optional.of(new SymbolSemantics(SymbolSemantics.Role.BIOME,
@@ -35,9 +51,14 @@ public final class BiomeSymbolPages {
 
     public static String fallbackName(ResourceLocation symbolId) {
         String path = symbolId.getPath().substring("biome/".length());
-        return Arrays.stream(path.split("_"))
+        int separator = path.indexOf('/');
+        String namespace = separator < 0 ? "" : path.substring(0, separator);
+        if (separator >= 0) path = path.substring(separator + 1);
+        String label = path.replace('/', '_');
+        String name = Arrays.stream(label.split("_"))
                 .filter(part -> !part.isEmpty())
                 .map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
                 .reduce((left, right) -> left + " " + right).orElse("Unknown") + " Biome";
+        return namespace.isEmpty() ? name : name + " (" + namespace + ")";
     }
 }

src/main/java/net/dnorberg/rivencraft/writing/SymbolCatalog.java

@@ -69,7 +69,6 @@ public final class SymbolCatalog {
             });
             registries.lookupOrThrow(Registries.BIOME).listElements()
                     .map(holder -> holder.key().location())
-                    .filter(id -> id.getNamespace().equals("minecraft"))
                     .forEach(id -> loaded.putIfAbsent(BiomeSymbolPages.symbolId(id),
                             BiomeSymbolPages.definition(id)));
             BlockSymbolPages.availableBlocks().forEach(id -> loaded.putIfAbsent(

src/main/resources/assets/rivencraft/lang/en_us.json

@@ -258,6 +258,7 @@
   "itemGroup.rivencraft.pages.link": "Rivencraft Link Pages",
   "itemGroup.rivencraft.pages.terrain": "Rivencraft Terrain Pages",
   "itemGroup.rivencraft.pages.biome": "Rivencraft Biome Pages",
+  "itemGroup.rivencraft.pages.cave_biome": "Rivencraft Cave Biome Pages",
   "itemGroup.rivencraft.pages.biome_generation": "Rivencraft Biome Generation Pages",
   "itemGroup.rivencraft.pages.weather": "Rivencraft Weather Pages",
   "itemGroup.rivencraft.pages.lighting": "Rivencraft Lighting Pages",