fix patchouli

src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java

@@ -3,7 +3,7 @@ package de.ellpeck.naturesaura.compat.patchouli;
 import de.ellpeck.naturesaura.NaturesAura;
 import net.minecraft.util.ResourceLocation;
 import vazkii.patchouli.client.book.BookPage;
-import vazkii.patchouli.client.book.BookRegistry;
+import vazkii.patchouli.client.book.ClientBookRegistry;
 
 public final class PatchouliCompat {
 
@@ -15,6 +15,6 @@ public final class PatchouliCompat {
     }
 
     private static void addPatchouliPage(String name, Class<? extends BookPage> page) {
-        BookRegistry.INSTANCE.pageTypes.put(NaturesAura.MOD_ID + ":" + name, page);
+        ClientBookRegistry.INSTANCE.pageTypes.put(NaturesAura.MOD_ID + ":" + name, page);
     }
 }

src/main/resources/assets/naturesaura/lang/en_US.lang

@@ -24,11 +24,13 @@ item.naturesaura.infused_iron_hoe.name=Botanist's Hoe
 item.naturesaura.ancient_stick.name=Ancient Wood Rod
 item.naturesaura.aura_cache.name=Aura Cache
 item.naturesaura.color_changer.name=Bucket of Infinite Color
+item.naturesaura.book.name=Book of Natural Aura
 
 container.naturesaura.tree_ritual.name=Ritual of the Forest
 container.naturesaura.altar.name=Natural Altar Infusion
 
 info.naturesaura.aura_in_area=Aura Around
+info.naturesaura.book.landing=$(thing)Aura$() is a complicated matter, and creating, collecting and making use of it can be difficult.$(br)The $(item)Book of Natural Aura$() contains all the information one requires to do so.
 
 advancement.naturesaura.root=Nature's Aura
 advancement.naturesaura.root.desc=Becoming a magical botanist

src/main/resources/assets/naturesaura/patchouli_books/book/book.json

@@ -0,0 +1,7 @@
+{
+    "name": "item.naturesaura.book.name",
+    "landing_text": "info.naturesaura.book.landing",
+    "advancement_namespaces": [
+        "naturesaura"
+    ]
+}

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/collecting/altar.json

@@ -1,17 +1,17 @@
 {
     "name": "The Natural Altar",
     "icon": "naturesaura:nature_altar",
-    "category": "naturesaura:collecting",
+    "category": "collecting",
     "advancement": "naturesaura:wood_stand",
     "priority": true,
     "pages": [
         {
             "type": "text",
-            "text": "A rudimentary, yet effective way of collecting $(thing)Aura$() early on is the $(item)Natural Altar$(). After creating the setup shown on the following page, the altar will start slowly draining $(thing)Aura$() in the vicinity. However, it is not strong enough to cause major damage, making it only drain until there is none left in the area.$(br)The collected $(thing)Aura$() can then be used in several ways, $(l:naturesaura:using/altar)infusing items$() for instance."
+            "text": "A rudimentary, yet effective way of collecting $(thing)Aura$() early on is the $(item)Natural Altar$(). After creating the setup shown on the following page, the altar will start slowly draining $(thing)Aura$() in the vicinity. However, it is not strong enough to cause major damage, making it only drain until there is none left in the area.$(br)The collected $(thing)Aura$() can then be used in several ways, $(l:using/altar)infusing items$() for instance."
         },
         {
             "type": "naturesaura:tree_ritual",
-            "text": "Creating the $(item)Natural Altar$() using the $(l:naturesaura:practices/tree_ritual)Ritual of the Forest$()",
+            "text": "Creating the $(item)Natural Altar$() using the $(l:practices/tree_ritual)Ritual of the Forest$()",
             "recipe": "naturesaura:nature_altar"
         }
     ]

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/ancient_tree.json

@@ -1,7 +1,7 @@
 {
     "name": "Ancient Trees",
     "icon": "naturesaura:ancient_leaves",
-    "category": "naturesaura:creating",
+    "category": "creating",
     "advancement": "naturesaura:wood_stand",
     "priority": true,
     "pages": [
@@ -11,7 +11,7 @@
         },
         {
             "type": "naturesaura:tree_ritual",
-            "text": "Creating the $(item)Ancient Sapling$() using the $(l:naturesaura:practices/tree_ritual)Ritual of the Forest$()",
+            "text": "Creating the $(item)Ancient Sapling$() using the $(l:practices/tree_ritual)Ritual of the Forest$()",
             "recipe": "naturesaura:ancient_sapling"
         },
         {

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/aura.json

@@ -1,7 +1,7 @@
 {
     "name": "Aura, conceptually",
     "icon": "naturesaura:gold_leaf",
-    "category": "naturesaura:intro",
+    "category": "intro",
     "priority": true,
     "pages": [
         {

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/baubles.json

@@ -1,7 +1,7 @@
 {
     "name": "Baubles",
     "icon": "minecraft:totem_of_undying",
-    "category": "naturesaura:intro",
+    "category": "intro",
     "read_by_default": true,
     "flag": "mod:baubles",
     "pages": [

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/botany.json

@@ -1,7 +1,7 @@
 {
     "name": "Magical Botany",
     "icon": "minecraft:sapling",
-    "category": "naturesaura:intro",
+    "category": "intro",
     "priority": true,
     "pages": [
         {

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/aura_cache.json

@@ -0,0 +1,17 @@
+{
+    "name": "Aura Cache",
+    "icon": "naturesaura:aura_cache",
+    "category": "items",
+    "advancement": "naturesaura:infused_materials",
+    "pages": [
+        {
+            "type": "text",
+            "text": "Having a $(l:collecting/altar)Natural Altar$() around that stores $(thing)Aura$() is all well and good, but it would be more convenient to be able to carry it around. In that case, the $(item)Aura Cache$() will prove useful: It stores a substantial amount of $(thing)Aura$() in it so one can use it on the go. $(br)To fill the cache up, simply place it on a $(item)Natural Altar$() and wait for the $(thing)Aura$() to drain into it."
+        },
+        {
+            "type": "crafting",
+            "text": "Creating the $(item)Aura Cache$()",
+            "recipe": "naturesaura:aura_cache"
+        }
+    ]
+}

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/color_changer.json

@@ -1,7 +1,7 @@
 {
     "name": "Bucket of Infinite Color",
     "icon": "naturesaura:color_changer",
-    "category": "naturesaura:items",
+    "category": "items",
     "advancement": "naturesaura:infused_materials",
     "pages": [
         {
@@ -10,7 +10,7 @@
         },
         {
             "type": "text",
-            "text": "To use the bucket, simply sneak and interact with any dyeable block. To then transfer that color onto a block, simply interact with it.$(br)Sneaking and interacting with the item itself will cause it to switch into $(thing)fill mode$(), meaning that, upon dyeing a block, all surrounding blocks with the same color will also be changed.$(br)Of course, this comes with the cost of some $(thing)Aura$(), which needs to be supplied in the form of an $(l:naturesaura:items/aura_cache)Aura Cache$() in one's inventory."
+            "text": "To use the bucket, simply sneak and interact with any dyeable block. To then transfer that color onto a block, simply interact with it.$(br)Sneaking and interacting with the item itself will cause it to switch into $(thing)fill mode$(), meaning that, upon dyeing a block, all surrounding blocks with the same color will also be changed.$(br)Of course, this comes with the cost of some $(thing)Aura$(), which needs to be supplied in the form of an $(l:items/aura_cache)Aura Cache$() in one's inventory."
         },
         {
             "type": "crafting",

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/eye.json

@@ -1,7 +1,7 @@
 {
     "name": "Environmental Eye",
     "icon": "naturesaura:eye",
-    "category": "naturesaura:items",
+    "category": "items",
     "advancement": "naturesaura:wood_stand",
     "pages": [
         {
@@ -14,7 +14,7 @@
         },
         {
             "type": "naturesaura:tree_ritual",
-            "text": "Creating the $(item)Environmental Eye$() using the $(l:naturesaura:practices/tree_ritual)Ritual of the Forest$()",
+            "text": "Creating the $(item)Environmental Eye$() using the $(l:practices/tree_ritual)Ritual of the Forest$()",
             "recipe": "naturesaura:eye"
         }
     ]

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/infused_iron_tools.json

@@ -1,12 +1,12 @@
 {
     "name": "Botanist's Tools",
     "icon": "naturesaura:infused_iron_pickaxe",
-    "category": "naturesaura:items",
+    "category": "items",
     "advancement": "naturesaura:infused_materials",
     "pages": [
         {
             "type": "text",
-            "text": "Using the inherent powers of $(l:naturesaura:using/altar)Infused Iron$(), one can produce tools that not only have similar properties to its base material $(item)Iron$(), but also have additional features that one wouldn't quite expect.$(br)The following pages will display how to create the tools and how to use their special features."
+            "text": "Using the inherent powers of $(l:using/altar)Infused Iron$(), one can produce tools that not only have similar properties to its base material $(item)Iron$(), but also have additional features that one wouldn't quite expect.$(br)The following pages will display how to create the tools and how to use their special features."
         },
         {
             "type": "text",

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/gold_trees.json

@@ -1,7 +1,7 @@
 {
     "name": "Brilliant Trees",
     "icon": "naturesaura:gold_leaf",
-    "category": "naturesaura:practices",
+    "category": "practices",
     "priority": true,
     "pages": [
         {
@@ -21,7 +21,7 @@
         },
         {
             "type": "crafting",
-            "text": "$(item)Gold Leaf$(), once harvested, can easily be crushed into $(item)Gold Powder$() which can be placed on the ground as an integral part of the $(l:naturesaura:practices/tree_ritual)Ritual of the Forest$().",
+            "text": "$(item)Gold Leaf$(), once harvested, can easily be crushed into $(item)Gold Powder$() which can be placed on the ground as an integral part of the $(l:practices/tree_ritual)Ritual of the Forest$().",
             "recipe": "naturesaura:gold_powder"
         }
     ]

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/tree_ritual.json

@@ -1,13 +1,13 @@
 {
     "name": "Ritual of the Forest",
     "icon": "naturesaura:wood_stand",
-    "category": "naturesaura:practices",
+    "category": "practices",
     "advancement": "naturesaura:gold_leaf",
     "priority": true,
     "pages": [
         {
             "type": "text",
-            "text": "When starting out as a magical botanist, it proves beneficial to use the powers of nature on a more direct level before delving directly into $(thing)Aura$() itself. The $(item)Ritual of the Forest$() uses properties of $(l:naturesaura:practices/gold_trees)Gold Powder$() to encorporate the power of natural ingredients directly into a fresh, growing tree, devouring it in the process, but at the same time, transforming it into useful tools and items."
+            "text": "When starting out as a magical botanist, it proves beneficial to use the powers of nature on a more direct level before delving directly into $(thing)Aura$() itself. The $(item)Ritual of the Forest$() uses properties of $(l:practices/gold_trees)Gold Powder$() to encorporate the power of natural ingredients directly into a fresh, growing tree, devouring it in the process, but at the same time, transforming it into useful tools and items."
         },
         {
             "type": "text",

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/altar.json

@@ -1,13 +1,13 @@
 {
     "name": "Natural Altar Infusion",
     "icon": "naturesaura:nature_altar",
-    "category": "naturesaura:using",
+    "category": "using",
     "advancement": "naturesaura:altar",
     "priority": true,
     "pages": [
         {
             "type": "text",
-            "text": "When the $(l:naturesaura:collecting/altar)Natural Altar$() has collected a sufficient amount of $(thing)Aura$(), it will be able to infuse items of certain materials, converting them into different, more powerful materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)The following pages list some useful materials that a botanist might frequently need."
+            "text": "When the $(l:collecting/altar)Natural Altar$() has collected a sufficient amount of $(thing)Aura$(), it will be able to infuse items of certain materials, converting them into different, more powerful materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)The following pages list some useful materials that a botanist might frequently need."
         },
         {
             "type": "naturesaura:altar",

src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/aura_cache.json

@@ -1,17 +0,0 @@
-{
-    "name": "Aura Cache",
-    "icon": "naturesaura:aura_cache",
-    "category": "naturesaura:items",
-    "advancement": "naturesaura:infused_materials",
-    "pages": [
-        {
-            "type": "text",
-            "text": "Having a $(l:naturesaura:collecting/altar)Natural Altar$() around that stores $(thing)Aura$() is all well and good, but it would be more convenient to be able to carry it around. In that case, the $(item)Aura Cache$() will prove useful: It stores a substantial amount of $(thing)Aura$() in it so one can use it on the go. $(br)To fill the cache up, simply place it on a $(item)Natural Altar$() and wait for the $(thing)Aura$() to drain into it."
-        },
-        {
-            "type": "crafting",
-            "text": "Creating the $(item)Aura Cache$()",
-            "recipe": "naturesaura:aura_cache"
-        }
-    ]
-}