Lexicon fixes and additions

- added macros for Pasture Seeds entry
- corrected Blaze and Cocoon gog macros
- Elementium axe also decapitates piglins
- Rod of the Skies elytra boost
- alt recipes for mana tablet and runic altar using mana diamonds are now visible in lexicon
- both fabulous mana pool recipes are now on the same page since they have the same flavor text anyways
- removed slab-combining recipes from entries about the full blocks
- linked additional shimmerrock, shimmerwood, and quartz variant items to corresponding entry pages
- moved spark augment crafting recipes to their individual description pages
- mentioned phantom ink interaction with platforms
- various similar recipes use the multi-crafting page template
- fixed list formatting for Spectator entry
- Laputa shard maximum radius was somewhat exaggerated

Co-authored-by: Adarsh <[email protected]>

Xplat/src/main/resources/assets/botania/lang/en_us.json

@@ -1962,11 +1962,11 @@
   "botania.page.gardenOfGlass3": "Creating $(item)Saplings$(0)",
   "botania.page.gardenOfGlass4": "Creating $(l:basics/flowers)$(item)Floral Fertilizer$(0)$(/l)",
   "botania.page.gardenOfGlass5": "Creating $(item)Cobblestone$(0)",
-  "botania.page.gardenOfGlass6": "Aside from that, some things in $(thing)Botania$(0) have been changed to fit Skyblock gameplay: The $(l:functional_flowers/orechid_gog)$(item)Orechid$(0)$(/l) is easier to make, faster, and much more $(thing)Mana$(0)-efficient; The $(l:devices/cocoon)$(item)Cocoon of Caprice$(0)$(/l) and the $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l) have simpler recipes; the $(l:misc/blaze_block)$(item)Blaze Mesh$(0)$(/l), which can be purified into $(item)Obsidian$(0), is made from powder instead of rods; melon and pumpkin seeds can drop from tall grass; floral fertilizer yields more per craft; and certain additional recipes have been added.",
+  "botania.page.gardenOfGlass6": "Aside from that, some things in $(thing)Botania$(0) have been changed to fit Skyblock gameplay: The $(l:functional_flowers/orechid_gog)$(item)Orechid$(0)$(/l) is easier to make, faster, and much more $(thing)Mana$(0)-efficient; The $(l:devices/cocoon_gog)$(item)Cocoon of Caprice$(0)$(/l) and the $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l) have simpler recipes; the $(l:misc/blaze_block)$(item)Blaze Mesh$(0)$(/l), which can be purified into $(item)Obsidian$(0), is made from powder instead of rods; melon and pumpkin seeds can drop from tall grass; floral fertilizer yields more per craft; and certain additional recipes have been added.",
   "botania.page.gardenOfGlass7": "Creating $(item)Sugar Canes$(0)",
   "botania.page.gardenOfGlass8": "Creating $(item)Slimeballs$(0)",
   "botania.page.gardenOfGlass13": "Infusing $(item)Prismarine$(0)",
-  "botania.page.gardenOfGlass9": "Entering the $(thing)Nether$(0) might seem difficult under these conditions-- worry not, however, as $(l:misc/blaze_block)$(item)Blaze Meshes$(0)$(/l) (as mentioned previously) can be converted into $(item)Obsidian$(0). To get these lamps, spawn $(item)Blazes$(0) from $(l:devices/fel_pumpkin)$(item)Fel Pumpkins$(0)$(/l).$(p)Since there's no easily accessible $(item)Flint$(0) on an island in space, a $(item)Fire Charge$(0) will have to do for portal-opening.",
+  "botania.page.gardenOfGlass9": "Entering the $(thing)Nether$(0) might seem difficult under these conditions-- worry not, however, as $(l:misc/blaze_block)$(item)Blaze Meshes$(0)$(/l) (as mentioned previously) can be converted into $(item)Obsidian$(0). To get these lamps, spawn $(thing)Blazes$(0) from $(l:devices/fel_pumpkin)$(item)Fel Pumpkins$(0)$(/l).$(p)Since there's no easily accessible $(item)Flint$(0) on an island in space, a $(item)Fire Charge$(0) will have to do for portal-opening.",
   "botania.page.gardenOfGlass11": "The $(item)Mana Flash$(0) present in the starting area will allow a player without a $(l:basics/lexicon)$(item)Lexica Botania$(0)$(/l) to exchange a $(item)Sapling$(0) for one, by right-clicking the $(item)Sapling$(0) on the $(item)Mana Flash$(0).",
   "botania.page.gardenOfGlass12": "Lastly, a way to reach the End",
   "botania.page.gardenOfGlass14": "Creating the $(item)Heart of the Sea$(0)",
@@ -2672,7 +2672,7 @@
   "botania.entry.platform": "Abstruse Platform",
   "botania.tagline.platform": "Disguisable platform you can fall through",
   "botania.page.platform0": "When shaped into extremely specific patterns, $(l:basics/pure_daisy)$(item)Livingwood$(0)$(/l) can be crafted into a selectively-permeable block. The $(item)Abstruse Platform$(0) has a physical body only for non-sneaking entities above it; sneaking entities or those coming from below will pass right through. $(thing)Mana Bursts$(0) will also travel through a Platform without any trouble.",
-  "botania.page.platform2": "This block can be disguised as any other simple block by simply right-clicking the former with the latter. Right-clicking a disguised platform with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) spreads the disguise to all adjacent non-disguised blocks. Sneak-right clicking removes all disguises.",
+  "botania.page.platform2": "This block can be disguised as any other simple block by simply right-clicking the former with the latter. Right-clicking a disguised platform with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) spreads the disguise to all adjacent non-disguised blocks. Sneak-right clicking removes all disguises.$(p)Applying $(l:misc/phantom_ink)$(item)Phantom Ink$(0)$(/l) to a platform makes it completely invisible while retaining its other properties.",
   "botania.page.platform1": "It would be Ethereal but the name was taken",
 
   "botania.entry.manaConjuration": "Conjuring with Mana",
@@ -2779,9 +2779,9 @@
   "botania.entry.grassSeeds": "Pasture Seeds",
   "botania.tagline.grassSeeds": "Seeds to create Grass, Podzol and Mycelium",
   "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block, either by hand or in a $(item)Dispenser$(0).$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
-  "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for grass",
-  "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for podzol",
-  "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for mycelium",
+  "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for $(item)Grass$(0)",
+  "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for $(item)Podzol$(0)",
+  "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for $(item)Mycelium$(0)",
   "botania.page.grassSeeds4": "An additional six types of $(item)Pasture Seeds$(0) can be created, for alternative grasslike blocks with various textures.$(p)These spread to dirt like normal and can sustain any plant a block of grass can. Similarly, they may only be picked up with $(thing)Silk Touch$(0). However, these blocks don't decay back into dirt if covered.",
   "botania.page.grassSeeds5": "The alternate $(item)Pasture Seeds$(0)",
 
@@ -2855,7 +2855,7 @@
   "botania.page.elfGear3": "The $(item)Elementium Pickaxe$(0)",
   "botania.page.elfGear4": "The $(item)Elementium Shovel$(0) will, if the block broken is affected by gravity ($(item)Gravel$(0), $(item)Sand$(0), etc), also destroy all blocks of that material above/below it. No more gravel falling while mining!",
   "botania.page.elfGear5": "The $(item)Elementium Shovel$(0)",
-  "botania.page.elfGear6": "The $(item)Elementium Axe$(0) doubles as a weapon. If used to deal the finishing blow to any $(thing)Zombie$(0) or $(thing)Skeleton$(0) variant, $(thing)Creeper$(0), or other $(thing)Player$(0), it may decapitate its victim, leaving a severed head or skull behind.$(p)Unlike usual axes, the $(item)Elementium Axe$(0) supports the $(thing)Looting$() enchantment, which will increase the chance of skull drops.",
+  "botania.page.elfGear6": "The $(item)Elementium Axe$(0) doubles as a weapon. If used to deal the finishing blow to any $(thing)Zombie$(0) or $(thing)Skeleton$(0) variant, $(thing)Creeper$(0), $(thing)Piglin$(0), or other $(thing)Player$(0), it may decapitate its victim, leaving a severed head or skull behind.$(p)Unlike usual axes, the $(item)Elementium Axe$(0) supports the $(thing)Looting$() enchantment, which will increase the chance of skull drops.",
   "botania.page.elfGear7": "The $(item)Elementium Axe$(0)",
   "botania.page.elfGear7a": "The $(item)Elementium Hoe$(0) will instantly moisten farmland it creates, regardless of proximity to water, or whether water can even exist in the vicinity. Perfect for impatient farmers!",
   "botania.page.elfGear7b": "The $(item)Elementium Hoe$(0)",
@@ -2886,7 +2886,7 @@
   "botania.entry.tornadoRod": "Rod of the Skies",
   "botania.tagline.tornadoRod": "A rod for jumping high into the sky",
   "botania.page.tornadoRod0": "The $(item)Rod of the Skies$(0) uses $(thing)Mana$(0) to launch its user high in the air.$(p)To use it, simply right-click with it and watch yourself soar.$(p)The rod, after usage, will briefly enter a mode where it negates fall-damage, keeping its user safe.",
-  "botania.page.tornadoRod2": "This rod can be given to a $(l:devices/avatar)$(item)Livingwood Avatar$(0)$(/l). When so given, an avatar will use its $(thing)Mana$(0) to launch any players that jump near the avatar as if they'd used the rod themselves.",
+  "botania.page.tornadoRod2": "This rod can be given to a $(l:devices/avatar)$(item)Livingwood Avatar$(0)$(/l). When so given, an avatar will use its $(thing)Mana$(0) to launch any players that jump near the avatar as if they'd used the rod themselves.$(p)While gliding with $(item)Elytra$(0), using this rod will grant a small boost similar to a $(item)Firework$(0). An avatar holding the rod provides a greater boost to players gliding nearby.",
   "botania.page.tornadoRod1": "A treasure from Lorule",
 
   "botania.entry.fireRod": "Rod of the Hells",
@@ -2905,7 +2905,7 @@
   "botania.entry.laputaShard": "Shard of Laputa",
   "botania.tagline.laputaShard": "Raise parts of your world as floating islands",
   "botania.page.laputaShard0": "To abbreviate the complex magical sequences in its creation: combining certain specific resources, including $(l:alfhomancy/gaia_ritual)$(item)Gaia Spirits$(0)$(/l), allows one to create a shard of power that, when shattered upon the ground, will lift a spheroid area around the point it was smashed high into the air.",
-  "botania.page.laputaShard2": "A freshly-created shard will lift a sphere of about 14 blocks in radius, but the shard's radius can be upgraded with additional $(l:alfhomancy/gaia_ritual)$(item)Gaia Spirits$(0)$(/l); each shard adds another block to the radius, up to a radius of 44 blocks. Note that a larger shard can take at least ten minutes, and possibly much more, to finish its lifting.",
+  "botania.page.laputaShard2": "A freshly-created shard will lift a sphere of about 14 blocks in radius, but the shard's radius can be upgraded with additional $(l:alfhomancy/gaia_ritual)$(item)Gaia Spirits$(0)$(/l); each shard adds another block to the radius, up to a radius of 33 blocks. Note that a larger shard can take at least ten minutes, and possibly much more, to finish its lifting.",
   "botania.page.laputaShard1": "Look, Shiro, Laputa exists!",
   "botania.page.laputaShard3": "Size does matter",
 
@@ -3340,7 +3340,7 @@
   "botania.entry.itemFinder": "The Spectator",
   "botania.tagline.itemFinder": "Find items in chests, minecarts, and villager trades",
   "botania.page.itemFinder0": "$(item)The Spectator$(0) is a headband that allows its wearer to perceive the world in a better way. When its wearer holds an item, all of the following will emit colorful particles for easy spotting:",
-  "botania.page.itemFinder1": "$(li)$(thing)containers$(0) (chests, minecarts, furnaces, etc...) containing that item,$(br)$(li)$(thing)dropped items$(0) of that type,$(br)$(li)$(thing)mobs$(0) with that item equipped,$(br)$(li)$(thing)players$(0) with that item in their inventory,$(br)$(li)$(thing)villagers$(0) trading for that item.$(p)When sneaking, all dropped items near the wearer will shine, regardless of the held item.",
+  "botania.page.itemFinder1": "$(li)$(thing)containers$(0) (chests, minecarts, furnaces, etc.) containing that item,$(li)$(thing)dropped items$(0) of that type,$(li)$(thing)mobs$(0) with that item equipped,$(li)$(thing)players$(0) or $(thing)pack animals$(0) (llamas, mules, etc.) with that item in their inventory,$(li)$(thing)villagers$(0) trading for that item.$(p)When sneaking, all dropped items near the wearer will shine, regardless of the held item.",
   "botania.page.itemFinder2": "Do you hear their voices?",
 
   "botania.entry.superLavaPendant": "Crimson Pendant",
@@ -3514,10 +3514,10 @@
   "botania.entry.decorativeBlocks": "Decorative Blocks",
   "botania.tagline.decorativeBlocks": "Make your botanical builds beautiful",
   "botania.page.decorativeBlocks0": "Quite apart from functionality, there exist quite a few blocks for the sole purpose of making your builds look better.$(p)$(item)Livingrock$(0) and $(l:basics/pure_daisy)$(item)Livingwood$(0)$(/l) can be turned into decorative blocks; each material has four different decorative variations on its texture.",
-  "botania.page.decorativeBlocks1": "Livingrock bricks.",
+  "botania.page.decorativeBlocks1": "Livingrock bricks and slate",
   "botania.page.decorativeBlocks2": "Mossing the bricks",
   "botania.page.decorativeBlocks3": "Cracking the bricks",
-  "botania.page.decorativeBlocks4": "Framing the bricks",
+  "botania.page.decorativeBlocks4": "Chiseling the bricks",
   "botania.page.decorativeBlocks5": "Turning wood into planks",
   "botania.page.decorativeBlocks6": "Mossing the planks",
   "botania.page.decorativeBlocks7": "Framing the planks",

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_resources.json

@@ -58,6 +58,11 @@
   ],
   "extra_recipe_mappings": {
     "botania:elementium_nugget": 3,
+    "botania:elf_quartz": 7,
+    "botania:chiseled_elf_quartz": 7,
+    "botania:elf_quartz_slab": 7,
+    "botania:elf_quartz_stairs": 7,
+    "botania:elf_quartz_pillar": 7,
     "botania:elf_glass_pane": 9
   }
 }

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json

@@ -19,9 +19,9 @@
       "text": "botania.page.runeAltar1"
     },
     {
-      "type": "crafting",
+      "type": "botania:crafting_multi",
       "text": "botania.page.runeAltar2",
-      "recipe": "botania:runic_altar"
+      "recipes": ["botania:runic_altar", "botania:runic_altar_alt"]
     },
     {
       "type": "text",

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/mana/mana_tablet.json

@@ -14,9 +14,9 @@
       "text": "botania.page.manaTablet1"
     },
     {
-      "type": "crafting",
+      "type": "botania:crafting_multi",
       "text": "botania.page.manaTablet2",
-      "recipe": "botania:mana_tablet"
+      "recipes": ["botania:mana_tablet", "botania:mana_tablet_alt"]
     }
   ]
 }

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/mana/spark_upgrades.json

@@ -10,31 +10,28 @@
       "text": "botania.page.sparkUpgrades0"
     },
     {
-      "type": "text",
-      "text": "botania.page.sparkUpgrades1"
-    },
-    {
-      "type": "text",
-      "text": "botania.page.sparkUpgrades2"
+      "type": "botania:crafting_multi",
+      "heading": "",
+      "text": "botania.page.sparkUpgrades1",
+      "recipes": ["botania:spark_upgrade_dispersive"]
     },
     {
-      "type": "text",
-      "text": "botania.page.sparkUpgrades3"
+      "type": "botania:crafting_multi",
+      "heading": "",
+      "text": "botania.page.sparkUpgrades2",
+      "recipes": ["botania:spark_upgrade_dominant"]
     },
     {
-      "type": "text",
-      "text": "botania.page.sparkUpgrades4"
+      "type": "botania:crafting_multi",
+      "heading": "",
+      "text": "botania.page.sparkUpgrades3",
+      "recipes": ["botania:spark_upgrade_recessive"]
     },
     {
       "type": "botania:crafting_multi",
-      "heading":"botania.entry.sparkUpgrades",
-      "text": "botania.page.sparkUpgrades5",
-      "recipes": [
-        "botania:spark_upgrade_dispersive",
-        "botania:spark_upgrade_dominant",
-        "botania:spark_upgrade_recessive",
-        "botania:spark_upgrade_isolated"
-      ]
+      "heading": "",
+      "text": "botania.page.sparkUpgrades4",
+      "recipes": ["botania:spark_upgrade_isolated"]
     }
   ]
 }

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/misc/decorative_blocks.json

@@ -11,14 +11,13 @@
     {
       "type": "crafting",
       "text": "botania.page.decorativeBlocks1",
-      "recipe": "botania:slab_recombine/livingrock_bricks",
-      "recipe2": "botania:livingrock_bricks"
+      "recipe": "botania:livingrock_bricks",
+      "recipe2": "botania:livingrock_slate"
     },
     {
-      "type": "crafting",
+      "type": "botania:crafting_multi",
       "text": "botania.page.decorativeBlocks2",
-      "recipe": "botania:mossy_livingrock_bricks",
-      "recipe2": "botania:mossy_livingrock_bricks_vine"
+      "recipes": ["botania:mossy_livingrock_bricks", "botania:mossy_livingrock_bricks_vine"]
     },
     {
       "type": "smelting",
@@ -33,14 +32,12 @@
     {
       "type": "crafting",
       "text": "botania.page.decorativeBlocks5",
-      "recipe": "botania:slab_recombine/livingwood_planks",
-      "recipe2": "botania:livingwood_planks"
+      "recipe": "botania:livingwood_planks"
     },
     {
-      "type": "crafting",
+      "type": "botania:crafting_multi",
       "text": "botania.page.decorativeBlocks6",
-      "recipe": "botania:mossy_livingwood_planks",
-      "recipe2": "botania:mossy_livingwood_planks_vine"
+      "recipes": ["botania:mossy_livingwood_planks", "botania:mossy_livingwood_planks_vine"]
     },
     {
       "type": "crafting",
@@ -105,6 +102,36 @@
     "botania:livingwood_fence_gate": 5,
     "botania:livingwood_planks_slab": 5,
     "botania:glimmering_stripped_livingwood_log": 9,
-    "botania:glimmering_stripped_livingwood": 9
+    "botania:glimmering_stripped_livingwood": 9,
+    "botania:dark_quartz": 11,
+    "botania:chiseled_dark_quartz": 11,
+    "botania:dark_quartz_slab": 11,
+    "botania:dark_quartz_stairs": 11,
+    "botania:dark_quartz_pillar": 11,
+    "botania:mana_quartz": 12,
+    "botania:chiseled_mana_quartz": 12,
+    "botania:mana_quartz_slab": 12,
+    "botania:mana_quartz_stairs": 12,
+    "botania:mana_quartz_pillar": 12,
+    "botania:blaze_quartz": 13,
+    "botania:chiseled_blaze_quartz": 13,
+    "botania:blaze_quartz_slab": 13,
+    "botania:blaze_quartz_stairs": 13,
+    "botania:blaze_quartz_pillar": 13,
+    "botania:lavender_quartz": 14,
+    "botania:chiseled_lavender_quartz": 14,
+    "botania:lavender_quartz_slab": 14,
+    "botania:lavender_quartz_stairs": 14,
+    "botania:lavender_quartz_pillar": 14,
+    "botania:red_quartz": 15,
+    "botania:chiseled_red_quartz": 15,
+    "botania:red_quartz_slab": 15,
+    "botania:red_quartz_stairs": 15,
+    "botania:red_quartz_pillar": 15,
+    "botania:sunny_quartz": 16,
+    "botania:chiseled_sunny_quartz": 16,
+    "botania:sunny_quartz_slab": 16,
+    "botania:sunny_quartz_stairs": 16,
+    "botania:sunny_quartz_pillar": 16
   }
 }

Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/tools/rainbow_rod.json

@@ -30,24 +30,24 @@
     {
       "type": "crafting",
       "text": "botania.page.rainbowRod4",
-      "recipe": "botania:slab_recombine/shimmerrock",
-      "recipe2": "botania:shimmerrock"
+      "recipe": "botania:shimmerrock"
     },
     {
       "type": "crafting",
       "text": "botania.page.rainbowRod5",
-      "recipe": "botania:slab_recombine/shimmerwood_planks",
-      "recipe2": "botania:shimmerwood_planks"
+      "recipe": "botania:shimmerwood_planks"
     },
     {
       "type": "crafting",
       "text": "botania.page.rainbowRod7",
-      "recipe": "botania:fabulous_pool"
-    },
-    {
-      "type": "crafting",
-      "text": "botania.page.rainbowRod7",
-      "recipe": "botania:fabulous_pool_upgrade"
+      "recipe": "botania:fabulous_pool",
+      "recipe2": "botania:fabulous_pool_upgrade"
     }
-  ]
+  ],
+  "extra_recipe_mappings": {
+    "botania:shimmerrock_slab": 5,
+    "botania:shimmerrock_stairs": 5,
+    "botania:shimmerwood_planks_slab": 6,
+    "botania:shimmerwood_planks_stairs": 6
+  }
 }