explicitly note the sapling thing

closes #260

src/main/java/de/ellpeck/naturesaura/ModConfig.java

@@ -53,27 +53,27 @@ public final class ModConfig {
     public ModConfig(ForgeConfigSpec.Builder builder) {
         builder.push("general");
         this.additionalBotanistPickaxeConversions = builder
-                .comment("Additional conversion recipes for the Botanist's Pickaxe right click function. Each entry needs to be formatted as modid:input_block[prop1=value1,...]->modid:output_block[prop1=value1,...] where block state properties are optional")
+                .comment("Additional conversion recipes for the Botanist's Pickaxe right click function. Each entry needs to be formatted as modid:input_block[prop1=value1,...]->modid:output_block[prop1=value1,...] where block state properties are optional, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".additionalBotanistPickaxeConversions")
                 .defineList("additionalBotanistPickaxeConversions", Collections.emptyList(), s -> true);
         this.auraTypeOverrides = builder
-                .comment("Additional dimensions that map to Aura types that should be present in them. This is useful if you have a modpack with custom dimensions that should have Aura act similarly to an existing dimension in them. Each entry needs to be formatted as dimension_name->aura_type, where aura_type can be any of naturesaura:overworld, naturesaura:nether and naturesaura:end.")
+                .comment("Additional dimensions that map to Aura types that should be present in them. This is useful if you have a modpack with custom dimensions that should have Aura act similarly to an existing dimension in them. Each entry needs to be formatted as dimension_name->aura_type, where aura_type can be any of naturesaura:overworld, naturesaura:nether and naturesaura:end, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".auraTypeOverrides")
                 .defineList("auraTypeOverrides", Collections.emptyList(), s -> true);
         this.additionalOres = builder
-                .comment("Additional blocks that are recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as tag_name->oreWeight->dimension where a higher weight makes the ore more likely to spawn with 5000 being the weight of coal, the default ore with the highest weight, and dimension being any of overworld and nether")
+                .comment("Additional blocks that are recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as tag_name->oreWeight->dimension where a higher weight makes the ore more likely to spawn with 5000 being the weight of coal, the default ore with the highest weight, and dimension being any of overworld and nether, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".additionalOres")
                 .defineList("additionalOres", Collections.emptyList(), s -> true);
         this.oreExceptions = builder
-                .comment("Blocks that are exempt from being recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as modid:block[prop1=value1,...] where block state properties are optional")
+                .comment("Blocks that are exempt from being recognized as generatable ores for the passive ore generation effect. Each entry needs to be formatted as modid:block[prop1=value1,...] where block state properties are optional, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".oreExceptions")
                 .defineList("oreExceptions", Collections.emptyList(), s -> true);
         this.plantBoostExceptions = builder
-                .comment("Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block")
+                .comment("Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".plantBoostExceptions")
                 .defineList("plantBoostExceptions", Collections.emptyList(), s -> true);
         this.additionalProjectiles = builder
-                .comment("Additional projectile types that are allowed to be consumed by the projectile generator. Each entry needs to be formatted as entity_registry_name->aura_amount")
+                .comment("Additional projectile types that are allowed to be consumed by the projectile generator. Each entry needs to be formatted as entity_registry_name->aura_amount, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).")
                 .translation("config." + NaturesAura.MOD_ID + ".additionalProjectiles")
                 .defineList("additionalProjectiles", Collections.emptyList(), s -> true);
         this.fieldCreatorRange = builder

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

@@ -169,8 +169,6 @@
     "info.naturesaura.remaining": "%s remaining",
     "info.naturesaura.break_prevention": "Eir's Token applied",
     "info.naturesaura.broken": " (Broken)",
-    "info.naturesaura.required_aura_type.naturesaura:overworld": "Requires Natural Altar",
-    "info.naturesaura.required_aura_type.naturesaura:nether": "Requires Crimson Altar",
     "info.naturesaura.pet_reviver": "Your pet %s was in distress and has been sent home.",
     "advancement.naturesaura.root": "Nature's Aura",
     "advancement.naturesaura.root.desc": "Becoming a magical botanist",
@@ -184,8 +182,6 @@
     "advancement.naturesaura.altar.desc": "Create a Natural Altar using the Ritual of the Forest",
     "advancement.naturesaura.infused_materials": "Iron Factory",
     "advancement.naturesaura.infused_materials.desc": "Use the Natural Altar to create Infused Iron",
-    "advancement.naturesaura.tainted_gold": "Gold Factory",
-    "advancement.naturesaura.tainted_gold.desc": "Use the Crimson Altar to create Tainted Gold",
     "advancement.naturesaura.furnace_heater": "Cozy Warmth",
     "advancement.naturesaura.furnace_heater.desc": "Create an Extraneous Firestarter to heat your furnace",
     "advancement.naturesaura.placer": "Plop Plop Placement",

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

@@ -2,7 +2,7 @@
     "name": "Aura Bottling",
     "icon": "naturesaura:aura_bottle{stored_type:'naturesaura:overworld'}",
     "category": "naturesaura:practices",
-    "advancement": "naturesaura:wood_stand",
+    "advancement": "naturesaura:gold_leaf",
     "turnin": "naturesaura:aura_bottle_overworld",
     "pages": [
         {

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

@@ -12,7 +12,7 @@
         },
         {
             "type": "text",
-            "text": "To construct this $(thing)ritual$(), one has to place $(item)Gold Powder$() in the configuration shown on the next page, with some $(item)Wooden Stands$() around that which will hold the ingredients.$(br)Then, the correct $(item)Sapling$() must be placed in the middle, and, either through some kind of fertilizer, or through the inevitability of time, its growth will cause the ritual to start."
+            "text": "To construct this $(thing)ritual$(), one has to place $(item)Gold Powder$() in the configuration shown on the next page, with some $(item)Wooden Stands$() around that which will hold the ingredients.$(br)Then, the correct $(item)Sapling$() must be placed in the middle, and, either through some kind of fertilizer, or through the inevitability of time, its growth will cause the ritual to start.$(br)Note that care needs to be taken as rituals require $(bold)specific types of saplings$()."
         },
         {
             "type": "multiblock",

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

@@ -23,17 +23,22 @@
         {
             "type": "crafting",
             "recipe": "naturesaura:gold_brick",
-            "text": "Creating the $(item)Golden Stone Bricks$() that are used in the $(item)Natural Altar$()'s multiblock"
+            "text": "Creating the $(item)Golden Stone Bricks$() that are used in the $(item)Natural Altar$()'s multiblock. Alternatively, $(item)Golden Nether Bricks$() can be created in a similar fashion."
         },
         {
             "type": "text",
-            "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)In the future, one might come across materials that require a different type of $(aura) to be present around the altar, for which the $(l:using/crimson_altar)Crimson Altar$() will have to be constructed."
+            "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed."
         },
         {
             "type": "naturesaura:altar",
             "text": "Creating $(item)Infused Iron$(), a material blessed with the powers of $(aura), allowing it to be used in several magical $(thing)natural items$().$(br)Note that the same infusion is possible using the materials' block form.",
             "recipe": "naturesaura:infused_iron"
         },
+        {
+            "type": "naturesaura:altar",
+            "text": "Creating $(item)Tainted Gold$(), a material blessed with the deeper, darker aspects of $(aura), meaning they take much longer to infuse while using less $(aura) in the process.$(br)Note that the same infusion is possible using the materials' block form.",
+            "recipe": "naturesaura:tainted_gold"
+        },
         {
             "type": "naturesaura:altar",
             "text": "Creating $(item)Infused Rock$(), an earthly material infused with $(aura).",

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

@@ -107,6 +107,16 @@
             "type": "naturesaura:altar",
             "text": "Turning $(item)Water$() into $(item)Milk$()$(p)$(italic)Just like Jesus$()",
             "recipe": "naturesaura:milk"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Turning $(item)Amethyst Shards$() into $(item)Ender Pearls$()",
+            "recipe": "naturesaura:ender_pearl"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Turning $(item)Soul Soil$() into $(item)Ghast Tears$()",
+            "recipe": "naturesaura:ghast_tear"
         }
     ]
 }

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

@@ -42,6 +42,26 @@
             "type": "naturesaura:altar",
             "text": "Making $(item)Gold Powder$() from $(item)Golden Leaves$()",
             "recipe": "naturesaura:gold_powder"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Reducing $(item)Amethyst Blocks$() to $(item)Shards$()",
+            "recipe": "naturesaura:amethyst"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Turning $(item)Packed Mud$() back into $(item)Mud$()",
+            "recipe": "naturesaura:mud"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Extracting $(item)Nether Warts$() from $(item)Nether Wart Blocks$()",
+            "recipe": "naturesaura:nether_wart_crushing"
+        },
+        {
+            "type": "naturesaura:altar",
+            "text": "Turning $(item)Soul Soil$() into $(item)Soul Sand$()",
+            "recipe": "naturesaura:soul_sand_crushing"
         }
     ]
 }

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

@@ -27,7 +27,7 @@
         },
         {
             "type": "text",
-            "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)In the future, one might come across materials that require a different type of $(aura) to be present around the altar, for which the $(l:using/crimson_altar)Crimson Altar$() will have to be constructed."
+            "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed."
         },
         {
             "type": "naturesaura:altar",

src/main/resources/data/naturesaura/advancements/tainted_gold.json

@@ -1,26 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "naturesaura:tainted_gold"
-        },
-        "title": {
-            "translate": "advancement.naturesaura.tainted_gold"
-        },
-        "description": {
-            "translate": "advancement.naturesaura.tainted_gold.desc"
-        }
-    },
-    "parent": "naturesaura:aura_bottle_nether",
-    "criteria": {
-        "materials": {
-            "trigger": "minecraft:inventory_changed",
-            "conditions": {
-                "items": [
-                    {
-                        "items": ["naturesaura:tainted_gold"]
-                    }
-                ]
-            }
-        }
-    }
-}

src/main/resources/data/naturesaura/recipes/altar/amethyst.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:amethyst_block"
+    },
+    "output": {
+        "item": "minecraft:amethyst_shard"
+    },
+    "catalyst": {
+        "item": "naturesaura:crushing_catalyst"
+    },
+    "aura": 25000,
+    "time": 200
+}

src/main/resources/data/naturesaura/recipes/altar/ender_pearl.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:amethyst_shard"
+    },
+    "output": {
+        "item": "minecraft:ender_pearl"
+    },
+    "catalyst": {
+        "item": "naturesaura:conversion_catalyst"
+    },
+    "aura": 90000,
+    "time": 300
+}

src/main/resources/data/naturesaura/recipes/altar/ghast_tear.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:soul_soil"
+    },
+    "output": {
+        "item": "minecraft:ghast_tear"
+    },
+    "catalyst": {
+        "item": "naturesaura:conversion_catalyst"
+    },
+    "aura": 90000,
+    "time": 300
+}

src/main/resources/data/naturesaura/recipes/altar/mud.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:packed_mud"
+    },
+    "output": {
+        "item": "minecraft:mud"
+    },
+    "catalyst": {
+        "item": "naturesaura:crushing_catalyst"
+    },
+    "aura": 2000,
+    "time": 20
+}

src/main/resources/data/naturesaura/recipes/altar/nether_wart_crushing.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:nether_wart_block"
+    },
+    "output": {
+        "item": "minecraft:nether_wart"
+    },
+    "catalyst": {
+        "item": "naturesaura:crushing_catalyst"
+    },
+    "aura": 25000,
+    "time": 200
+}

src/main/resources/data/naturesaura/recipes/altar/soul_sand_crushing.json

@@ -0,0 +1,14 @@
+{
+    "type": "naturesaura:altar",
+    "input": {
+        "item": "minecraft:soul_soil"
+    },
+    "output": {
+        "item": "minecraft:soul_sand"
+    },
+    "catalyst": {
+        "item": "naturesaura:crushing_catalyst"
+    },
+    "aura": 6000,
+    "time": 40
+}

src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json

@@ -6,6 +6,6 @@
     "output": {
         "item": "naturesaura:tainted_gold"
     },
-    "aura": 15000,
+    "aura": 3000,
-    "time": 80
+    "time": 300
 }

src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json

@@ -6,6 +6,6 @@
     "output": {
         "item": "naturesaura:tainted_gold_block"
     },
-    "aura": 135000,
+    "aura": 27000,
-    "time": 700
+    "time": 2625
 }

src/main/resources/data/naturesaura/recipes/chunk_loader.json

@@ -1,7 +1,7 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "ONO",
+        "OSO",
         "PEP",
         "ONO"
     ],
@@ -21,6 +21,9 @@
             "nbt": {
                 "stored_type": "naturesaura:end"
             }
+        },
+        "S": {
+            "item": "minecraft:spyglass"
         }
     },
     "result": {

src/main/resources/data/naturesaura/recipes/firework_generator.json

@@ -3,7 +3,7 @@
     "pattern": [
         "SFS",
         "GIG",
-        "TSJ"
+        "TLJ"
     ],
     "key": {
         "F": {
@@ -23,6 +23,9 @@
         },
         "I": {
             "item": "naturesaura:sky_ingot"
+        },
+        "L": {
+            "item": "minecraft:lightning_rod"
         }
     },
     "result": {

src/main/resources/data/naturesaura/recipes/fortress_finder.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "E": {
-            "item": "minecraft:ender_eye"
+            "item": "minecraft:ender_pearl"
         },
         "C": {
             "type": "forge:nbt",