Remove Gourmet, Add Fruit Stuff (#4176)

* I probably shouldve made more commits

* field guide and saw

Author: Redeix

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/food_and_water.json

@@ -67,7 +67,7 @@
         },
         {
             "type": "patchouli:text",
-            "text": "You can also drink out of other containers such as $(l:waterflasks)Flasks$() or $(l:mechanics/glassworking)Glass Bottles$()."
+            "text": "You can also drink out of other containers such as $(l:waterflasks)Flasks$() or $(l:mechanics/glassworking)Glass Bottles$(). Read more about drinking containers and drink effects $(l:mechanics/drinks#containers)Here$()"
         },
         {
             "type": "patchouli:text",
@@ -242,7 +242,7 @@
                 "tfc:mechanics/animal_husbandry",
                 "tfc:mechanics/crops",
                 "tfc:the_world/wild_fruits",
-                "tfc:mechanics/hydration",
+                "tfc:mechanics/drinks",
                 "tfc:mechanics/decay",
                 "tfc:firmalife/differences_from_tfc",
                 "tfc:beneath/beneath_crops",

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json

@@ -1,24 +1,40 @@
 {
-	"name": "Drink Effects",
+	"name": "Drinks",
 	"icon": "firmalife:olivine_wine_bottle",
 	"category": "tfc:mechanics",
 	"read_by_default": true,
 	"pages": [
 		{
 			"type": "patchouli:text",
-			"text": "Potions and magic don't exist in the world of TerraFirmaCraft, but there's plenty of other drinks that can provide similar effects!$(br2)This entry serves as a list of all the different effects, and as a bonus, they all keep you hydrated too."
+			"anchor": "intro",
+			"text": "Potions and magic don't exist in the world of TerraFirmaCraft, but there's plenty of other ways to get similar effects!$(br2)This entry serves as a list of drinks and their effects when consumed."
 		},
+        {
+            "type": "patchouli:text",
+            "title": "Index",
+            "anchor": "index",
+            "text": "$(li)$(bold)$(l:mechanics/drinks#containers)Containers$()$(li)$(bold)$(l:mechanics/drinks#alcohol)Alcohol$()$(li2)$(l:mechanics/drinks#aged_alcohol)Aged Alcohol$()$(li2)$(l:mechanics/drinks#vintage_alcohol)Vintage Alcohol$()$(li2)$(l:mechanics/drinks#wine)Wine$()$(li)$(bold)$(l:mechanics/drinks#spring_water)Spring Water$()$(li)$(bold)$(l:mechanics/drinks#sea_water)Sea Water$()$(li)$(bold)$(l:mechanics/drinks#muddy_water)Muddy Water$()$(li)$(bold)$(l:mechanics/drinks#juice)Fruit Juice$()$(li)$(bold)$(l:mechanics/drinks#yogurt)Yogurt$()$(li)$(bold)$(l:mechanics/drinks#smoothie)Fruit Smoothie$()$(li)$(bold)$(l:mechanics/drinks#ice_slush)Ice Slush$()"
+        },
 		{
 			"type": "patchouli:spotlight",
 			"title": "Drink containers",
 			"text": "You can drink things out of a $(l:getting_started/pottery#jug)Jug$(), $(l:waterflasks/recipes)Flask$(), or $(l:mechanics/glassworking_applications#glass_bottle)Glass Bottle$(). Jugs only hold enough for 1 drink and break easily. Glass bottles only hold a few drinks, and also have a chance of breaking. Flasks can hold even more and slowly use durability instead, except the $(item)Red Steel Flask$() which holds 20 drinks and never breaks.",
-			"item": "tfc:ceramic/jug,tfc:silica_glass_bottle,tfc:olivine_glass_bottle,tfc:hematitic_glass_bottle,tfc:volcanic_glass_bottle,waterflasks:leather_flask,waterflasks:iron_flask,waterflasks:red_steel_flask"
+			"item": "tfc:ceramic/jug,tfc:silica_glass_bottle,tfc:olivine_glass_bottle,tfc:hematitic_glass_bottle,tfc:volcanic_glass_bottle,waterflasks:leather_flask,waterflasks:iron_flask,waterflasks:red_steel_flask",
+			"anchor": "containers"
+		},
+		{
+			"type": "patchouli:spotlight",
+			"title": "Alcohol",
+			"text": "$(thing)Base Alcohols$() provide no buff to the player. They can be produced by leaving various fruits, flours, or other ingredients in a $(l:mechanics/barrels)Barrel$() with water. As a bonus, when drunk any alcohol will effect your speech in chat!",
+			"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey",
+			"anchor": "alcohol"
 		},
 		{
 			"type": "patchouli:spotlight",
 			"title": "Aged Alcohol",
-			"text": "$(thing)Aged Alcohols$() are prepared by ageing normal alcohol, which itself is made by leaving various fruits, flours, or other ingredients in a barrel with water. As a bonus, they effect your speech in chat!",
-			"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey"
+			"text": "$(thing)Aged Alcohols$() are prepared by ageing normal alcohol for 3 months in a sealed barrel. Aged alcohol provides effects when consumed.",
+			"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey",
+			"anchor": "aged_alcohol"
 		},
 		{
 			"type": "patchouli:text",
@@ -27,8 +43,9 @@
 		{
 			"type": "patchouli:spotlight",
 			"title": "Vintage Alcohol",
-			"text": "$(thing)Vintage Alcohols$() are prepared by further ageing aged alcohol in sealed barrels. These alcohols provide a stronger effect and a longer duration.",
-			"item": "tfg:vintage_beer_bucket,tfg:vintage_cider_bucket,tfg:vintage_rum_bucket,tfg:vintage_sake_bucket,tfg:vintage_vodka_bucket,tfg:vintage_whiskey_bucket,tfg:vintage_corn_whiskey_bucket,tfg:vintage_rye_whiskey_bucket"
+			"text": "$(thing)Vintage Alcohols$() are prepared by further ageing aged alcohol in sealed barrels for another 3 months. These alcohols provide a stronger effect and a longer duration.",
+			"item": "tfg:vintage_beer_bucket,tfg:vintage_cider_bucket,tfg:vintage_rum_bucket,tfg:vintage_sake_bucket,tfg:vintage_vodka_bucket,tfg:vintage_whiskey_bucket,tfg:vintage_corn_whiskey_bucket,tfg:vintage_rye_whiskey_bucket",
+			"anchor": "vintage_alcohol"
 		},
 		{
 			"type": "patchouli:text",
@@ -38,56 +55,79 @@
 			"type": "patchouli:text",
 			"title": "Wine",
 			"text": "$(thing)Wine$() is another kind of alcohol that's made in a different way than the others. It's a complex but rewarding process that can't be automated in a machine. Check the $(l:firmalife/wine)Winemaking$() entry to learn how to craft it.$(br2)All wines also give $(item)Strength (5:20)$() in addition to another effect!",
-			"item": "firmalife:bucket/red_wine,firmalife:bucket/white_wine,firmalife:bucket/rose_wine,firmalife:bucket/sparkling_wine,firmalife:bucket/dessert_wine"
+			"item": "firmalife:bucket/red_wine,firmalife:bucket/white_wine,firmalife:bucket/rose_wine,firmalife:bucket/sparkling_wine,firmalife:bucket/dessert_wine",
+			"anchor": "wine"
 		},
 		{
 			"type": "patchouli:text",
 			"text": "$(li)Red Wine: Haste (5:20)$(li)White Wine: Wither Resistance (5:20)$(li)Rose Wine: Swim Speed (5:20)$(li)Sparkling Wine: Jump Boost II (5:20)$(li)Dessert Wine: Knockback Resistance (5:20)"
 		},
 		{
 			"type": "patchouli:spotlight",
-			"title": "Teas",
-			"text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4°C. Perfect for winters!",
-			"item": "tfc_gourmet:tea_mint_bucket,tfc_gourmet:tea_chamomile_bucket,tfc_gourmet:tea_rosehip_bucket,tfc_gourmet:tea_nettle_bucket"
+			"title": "Milks",
+			"text": "$(thing)Milk$() can be aquired from most female livestock by simply right clicking them with a wood or metal bucket once familiarity is at a high enough level. (If the milking isn't working, make sure the buckets aren't stacked!)$(br)While it doesn't provide any buffs, it provides dairy nutrition if drank after eating, and can later be made into cheese.",
+			"item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk",
+			"anchor": "milk"
 		},
 		{
-			"type": "patchouli:text",
-			"text": "$(li)Mint Tea: Regeneration II (0:30)$(li)Chamomile Tea: Resistance II (0:30)$(li)Rosehip Tea: Absorption (0:30)$(li)Nettle Tea: Slow Falling (0:30)"
+			"title": "Spring Water",
+			"text": "Drinking $(thing)Spring Water$() warms you up by 4°C and applies a small regeneration effect while standing in it, as well as warming you.",
+			"item": "tfc:bucket/spring_water",
+			"type": "patchouli:spotlight",
+			"anchor": "spring_water"
 		},
 		{
+			"title": "Sea Water",
+			"text": "Drinking $(thing)Sea Water$() does not hydrate you and will make you more thirsty instead. A hot body temperature can also make you more thirsty. Lost at sea? Look upwards when it's raining for some easy hydration!",
 			"type": "patchouli:spotlight",
-			"title": "Treats",
-			"text": "This is a category for more misc drinks with delicious taste and special effects. Enjoy!",
-			"item": "tfc_gourmet:cocoa_bucket,tfc_gourmet:coffee_bucket,tfc_gourmet:nalivka_bucket,tfc_gourmet:kvass_bucket,tfc_gourmet:compote_bucket,tfc_gourmet:lemonade_bucket"
+			"item": "tfc:bucket/salt_water",
+			"anchor": "sea_water"
 		},
 		{
-			"type": "patchouli:text",
-			"text": "$(li)Cocoa: Haste (0:30), warms you up by 4°C$(li)Coffee: Speed (0:30), warms you up by 4°C$(li)Lemonade: Haste (0:30), cools you down by 2°C$(li)Nalivka: Haste (4:00), cools you down by 2°C$(li)Kvass: Haste (2:00), cools you down by 2°C$(li)Compote: Jump Boost II (0:30)"
+			"title": "Muddy Water",
+			"text": "Drinking $(thing)Muddy Water$() is not recommended. Doing so will make you nauseous and give you parasites.",
+			"type": "patchouli:spotlight",
+			"item": "tfg:muddy_water_bucket",
+			"anchor": "muddy_water"
 		},
 		{
+			"title": "Fruit Juice",
+			"text": "$(thing)Fruit Juice$() is a great way to condense your fruits into a longer lasting food item. Fruit juice provides the $(l:getting_started/food_and_water#quenching_transient_effect)Quenching Effect$(). Which helps stave off thirst.$(br2)Fruit Juice will expire over time.$()",
 			"type": "patchouli:spotlight",
-			"title": "Milks",
-			"text": "$(thing)Milk$() can be aquired from most female livestock by simply right clicking them with a wood or metal bucket once familiarity is at a high enough level. (If the milking isn't working, make sure the buckets aren't stacked!)$(br)While it doesn't provide any buffs, it provides dairy nutrition if drank after eating, and can later be made into cheese.",
-			"item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gourmet:ox_milk_bucket,tfc_gourmet:sheep_milk_bucket,tfc_gourmet:alpaca_milk_bucket"
+			"anchor": "juice",
+			"item": "tfg:food/juice"
 		},
 		{
-			"title": "Spring Water",
-			"text": "Drinking $(thing)Spring Water$() warms you up by 4°C and applies a small regeneration effect while standing in it, as well as warming you.",
-			"item": "tfc:bucket/spring_water",
-			"type": "patchouli:spotlight"
+			"title": "Yogurt",
+			"text": "$(thing)Yogurt$() provides dairy nutrition similarly to milk. It can also be mixed with fruit to make $(item)Fruit Yogurt$().$(br2)Yogurt will expire over time.$()",
+			"type": "patchouli:spotlight",
+			"anchor": "yogurt",
+			"item": "tfg:food/yogurt"
 		},
 		{
-			"title": "Sea Water",
-			"text": "Drinking $(thing)Sea Water$() does not hydrate you and will make you more thirsty instead. A hot body temperature can also make you more thirsty. Lost at sea? Look upwards when it's raining for some easy hydration!",
+			"title": "Fruit Smoothies",
+			"text": "$(thing)Smoothies$() are a powerful drink. They provide both the $(l:getting_started/food_and_water#quenching_transient_effect)Quenching Effect$() and the $(l:getting_started/food_and_water#cooling_transient_effect)Cooling Effect$(). They are also a great source for $(l:getting_started/food_and_water#fruit)Fruit$() and $(l:getting_started/food_and_water#dairy)Dairy$() nutrition.$(br2)Smoothies will expire over time.$()",
 			"type": "patchouli:spotlight",
-			"item": "tfc:bucket/salt_water"
+			"anchor": "smoothie",
+			"item": "tfg:food/smoothie"
 		},
 		{
 			"title": "Liquid Ice Slush",
 			"text": "Drinking $(thing)Ice Slush$() cools you down by 4°C, perfect for summer! Also handy for traversing the beneath.",
 			"type": "patchouli:spotlight",
-			"item": "gtceu:ice_bucket"
-		}
+			"item": "gtceu:ice_bucket",
+			"anchor": "ice_slush"
+		},
+        {
+            "type": "patchouli:relations",
+            "title": "Further Reading",
+            "anchor": "relations",
+            "entries": [
+                "tfc:getting_started/food_and_water",
+				"tfc:firmalife/wine",
+				"tfc:waterflasks/recipes"
+            ]
+        }
 	]
 }
 

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json

@@ -24,7 +24,7 @@
         {
             "type": "patchouli:spotlight",
             "title": "Mining Hammer",
-            "text": "These are basically a pickaxe with a 3x3 range, and will yield $(thing)raw ores$() as well. Also good for clearing stone after you've hammered the ores out!$(br2)Holding $(thing)sneak$() will only break a single block at a time.",
+            "text": "These are basically a pickaxe with a 3x3 range, and will yield $(thing)raw ores$() as well. Also good for quarrying stone!$(br2)Holding $(thing)sneak$() will only break a single block at a time.",
             "item": { "tag": "forge:tools/mining_hammers" }
         },
         {

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/mob_effects_glossary.json

@@ -25,7 +25,7 @@
 		{
 			"type": "patchouli:text",
 			"anchor": "quenched",
-			"text": "$(bold)$(9)Quenched$()$(li)While active this effect prevents the natural decay of $(l:getting_started/food_and_water#thirst)Thirsty$(). However, it does not prevent the Thirst effect from decreasing your meter.$()"
+			"text": "$(bold)$(9)Quenched$()$(li)While active this effect prevents the natural decay of $(l:getting_started/food_and_water#thirst)Thirst$(). However, it does not prevent the Thirsty effect from decreasing your meter.$()"
 		},
 		{
 			"type": "patchouli:text",