Merge pull request #577 from f-raZ0R/nightdew-clover

Add sarsaparilla, revamp fishing loot

Author: DaFuqs

src/main/java/de/dafuqs/spectrum/loot/SpectrumLootPoolModifiers.java

@@ -119,12 +119,18 @@ public static void setup() {
 				// because vanillas are too generic (fox/snow fox both use "fox" loot table)
 			}
 			else if (id.equals(new Identifier("archaeology/ocean_ruin_cold")) || id.equals(new Identifier("archaeology/ocean_ruin_warm")) ||
-					id.equals(new Identifier("archaeology/trail_ruins_rare")) || id.equals(new Identifier("archaeology/desert_pyramid")) || id.equals(new Identifier("archaeology/desert_well")))
+					id.equals(new Identifier("archaeology/trail_ruins_common")) || id.equals(new Identifier("archaeology/desert_pyramid")) || id.equals(new Identifier("archaeology/desert_well")))
 			{
 				tableBuilder.modifyPools(builder -> {
 					builder.with(ItemEntry.builder(SpectrumItems.NIGHTDEW_SPROUT).weight(2).quality(-1));
 				});
 			}
+			else if (id.equals(new Identifier("archaeology/trail_ruins_rare")))
+			{
+				tableBuilder.modifyPools(builder -> {
+					builder.with(ItemEntry.builder(SpectrumItems.NIGHTDEW_SPROUT).weight(3).quality(-1));
+				});
+			}
 			else if (id.equals(new Identifier("gameplay/sniffer_digging"))) {
 				tableBuilder.modifyPools(builder -> {
 					builder.with(ItemEntry.builder(SpectrumBlocks.WEEPING_GALA_SPRIG).weight(1));

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

@@ -2905,25 +2905,26 @@
   "book.spectrum.guidebook.inexorable.page1.text": "Prevents mining speed slowdowns (on tools) or movement slowdowns (on chestplates).\\\n\\\nMax Level: 1\\\nApplicable to mining tools and chestplates.",
   "book.spectrum.guidebook.infused_beverages.name": "Infused Beverages",
   "book.spectrum.guidebook.infused_beverages.page0.text": "Brewing is art!\\\nThere is so much to vary and try out that I probably won't finish trying out all the possible combinations in my lifetime.\\\nThey not only differ in their taste, but also in their effects.",
-  "book.spectrum.guidebook.infused_beverages.page10.text": "A strong flavor, enhanced by the influence of the colored wood. Grants [#](449900)Absorption[#]() and [#](449900)Resistance[#]().",
-  "book.spectrum.guidebook.infused_beverages.page11.text": "The high sugar content in honey is perfect for fermentation. The result is a strong, but still sweet drink.",
-  "book.spectrum.guidebook.infused_beverages.page12.text": "Fermented apples, usually sweet and sparkling, with a slight sour note - if I do not forget to tap it soon enough.",
-  "book.spectrum.guidebook.infused_beverages.page13.text": "Much stronger compared to their common counterparts. Won't go bad over time and taste glorious.",
-  "book.spectrum.guidebook.infused_beverages.page14.text": "A much more fruity cider than the apple one. The glowy variant seems to ferment a bit faster, but also... makes me glow. Hmm.",
-  "book.spectrum.guidebook.infused_beverages.page15.text": "Berries can also be used to make liqueur. Way more viscous, sweet and strong, but takes longer to ferment.",
-  "book.spectrum.guidebook.infused_beverages.page16.text": "*Liquid Luck*",
-  "book.spectrum.guidebook.infused_beverages.page19.text": "Only gets stronger with age. Just one question: How deadly do I want it to be today?",
-  "book.spectrum.guidebook.infused_beverages.page20.text": "Only gets stronger with age. Tastes like a bar fight.",
-  "book.spectrum.guidebook.infused_beverages.page21.text": "Wonderfully light in the mouth. A soft, sweet burn, which lets me forget my worries for a bit. In return, the things that worry me will forget me for a bit, too.\\\n\\\n*Tastes like walking on the moon.*",
-  "book.spectrum.guidebook.infused_beverages.page22.text": "More spicy than it looks.",
-  "book.spectrum.guidebook.infused_beverages.page23.text": "An interesting combination of all things Deeper Down. Best drunk while still hot!",
+  "book.spectrum.guidebook.infused_beverages.page11.text": "A strong flavor, enhanced by the influence of the colored wood. Grants [#](449900)Absorption[#]() and [#](449900)Resistance[#]().",
+  "book.spectrum.guidebook.infused_beverages.page12.text": "The high sugar content in honey is perfect for fermentation. The result is a strong, but still sweet drink.",
+  "book.spectrum.guidebook.infused_beverages.page13.text": "Fermented apples, usually sweet and sparkling, with a slight sour note - if I do not forget to tap it soon enough.",
+  "book.spectrum.guidebook.infused_beverages.page14.text": "Much stronger compared to their common counterparts. Won't go bad over time and taste glorious.",
+  "book.spectrum.guidebook.infused_beverages.page15.text": "A much more fruity cider than the apple one. The glowy variant seems to ferment a bit faster, but also... makes me glow. Hmm.",
+  "book.spectrum.guidebook.infused_beverages.page16.text": "Berries can also be used to make liqueur. Way more viscous, sweet and strong, but takes longer to ferment.",
+  "book.spectrum.guidebook.infused_beverages.page17.text": "*Liquid Luck*",
+  "book.spectrum.guidebook.infused_beverages.page20.text": "Only gets stronger with age. Just one question: How deadly do I want it to be today?",
+  "book.spectrum.guidebook.infused_beverages.page21.text": "Only gets stronger with age. Tastes like a bar fight.",
+  "book.spectrum.guidebook.infused_beverages.page22.text": "Wonderfully light in the mouth. A soft, sweet burn, which lets me forget my worries for a bit. In return, the things that worry me will forget me for a bit, too.\\\n\\\n*Tastes like walking on the moon.*",
+  "book.spectrum.guidebook.infused_beverages.page23.text": "More spicy than it looks.",
+  "book.spectrum.guidebook.infused_beverages.page24.text": "An interesting combination of all things Deeper Down. Best drunk while still hot!",
   "book.spectrum.guidebook.infused_beverages.page3.text": "Filling and tastes both sweet and savory. What a lovely combination.",
-  "book.spectrum.guidebook.infused_beverages.page4.text": "Sweet with a cinnamon finish.",
-  "book.spectrum.guidebook.infused_beverages.page5.text": "Makes me drowsy enough to sleep through the day.",
-  "book.spectrum.guidebook.infused_beverages.page6.text": "In addition to Haste it can grant a bit of Saturation, depending on how long it fermented.",
-  "book.spectrum.guidebook.infused_beverages.page7.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
+  "book.spectrum.guidebook.infused_beverages.page4.text": "Refreshing, but leaves a bitter taste in my mouth.",
+  "book.spectrum.guidebook.infused_beverages.page5.text": "Sweet with a cinnamon finish.",
+  "book.spectrum.guidebook.infused_beverages.page6.text": "Makes me drowsy enough to sleep through the day.",
+  "book.spectrum.guidebook.infused_beverages.page7.text": "In addition to Haste it can grant a bit of Saturation, depending on how long it fermented.",
   "book.spectrum.guidebook.infused_beverages.page8.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
-  "book.spectrum.guidebook.infused_beverages.page9.text": "Made from [Amaranth](entry://cuisine/amaranth), grants [#](449900)Luck[#]() and [#](449900)Haste[#]().",
+  "book.spectrum.guidebook.infused_beverages.page9.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
+  "book.spectrum.guidebook.infused_beverages.page10.text": "Made from [Amaranth](entry://cuisine/amaranth), grants [#](449900)Luck[#]() and [#](449900)Haste[#]().",
   "book.spectrum.guidebook.infused_beverages.poisonous_vodka.title": "...and a special variant",
   "book.spectrum.guidebook.ink.name": "Ink",
   "book.spectrum.guidebook.ink.page0.text": "Now that I'm familiar with [Pigment](entry://general/pigment), I see no reason to lug it around like in the Middle Ages. I have found a way to convert [Pigment](entry://general/pigment) into a higher form of energy!\\\n\\\nI called it **[#](5bffed)I[#](aa32a0)n[#](eded00)k[#]()**.",
@@ -4593,6 +4594,7 @@
   "item.spectrum.infused_beverage.tooltip.variant.rabbit_poison": "Rabbit Poison",
   "item.spectrum.infused_beverage.tooltip.variant.rum": "Rum",
   "item.spectrum.infused_beverage.tooltip.variant.sake": "Sake",
+  "item.spectrum.infused_beverage.tooltip.variant.sarsaparilla": "Sarsaparilla",
   "item.spectrum.infused_beverage.tooltip.variant.sawblade_holly_cider": "Sawblade Holly Cider",
   "item.spectrum.infused_beverage.tooltip.variant.sawblade_holly_liquor": "Sawblade Holly Liquor",
   "item.spectrum.infused_beverage.tooltip.variant.spiked_mullet_wine": "Spiked Mullet Wine",

src/main/resources/assets/spectrum/lang/pt_br.json

@@ -2863,38 +2863,28 @@
   "book.spectrum.guidebook.imperial_cookbook.page8.title": "Lotus of the Sea",
   "book.spectrum.guidebook.imperial_cookbook.page9.text": "*Don't let this ferment for too long or the mother is going to start eating away at the fish!*",
   "book.spectrum.guidebook.infused_beverages.name": "Infused Beverages",
-  "book.spectrum.guidebook.infused_beverages.page0.text": "Fermentation is a very natural process - things take time and care. As there is never a completely controlled environment, there are a lot of variables.\\\nI can follow the recipe to the letter, or play around a bit. Fermentation is an Art!",
-  "book.spectrum.guidebook.infused_beverages.page0.title": "The Art of Brewing",
-  "book.spectrum.guidebook.infused_beverages.page1.text": "- Time: It takes time for the barrel to influence the contents. Most drinks will develop more intense and even additional effects if given more time than strictly necessary\n- Temperature: The hotter it is, the more of the precious contents will simply evaporate over time. This is called the angel's share",
-  "book.spectrum.guidebook.infused_beverages.page1.title": "Outside Influences",
-  "book.spectrum.guidebook.infused_beverages.page10.text": "A strong flavor, enhanced by the influence of the colored wood. Grants [#](449900)Absorption[#]() and [#](449900)Resistance[#]().",
-  "book.spectrum.guidebook.infused_beverages.page11.text": "The high sugar content in honey is perfect for fermentation. The result is a strong, but still sweet drink.",
-  "book.spectrum.guidebook.infused_beverages.page12.text": "Fermented apples, usually sweet and sparkling, with a slight sour note - if I do not forget to tap it soon enough.",
-  "book.spectrum.guidebook.infused_beverages.page13.text": "Much stronger compared to their common counterparts. Won't go bad over time and taste glorious.",
-  "book.spectrum.guidebook.infused_beverages.page13.title": "Golden Ciders",
-  "book.spectrum.guidebook.infused_beverages.page14.text": "A much more fruity cider than the apple one. The glowy variety seems to ferment a bit faster, but also... makes me glow. Hmm.",
-  "book.spectrum.guidebook.infused_beverages.page15.text": "Berries can also be used to make liqueur. Way more viscous, sweet and strong, but takes longer to ferment.",
-  "book.spectrum.guidebook.infused_beverages.page16.text": "*Liquid Luck*",
-  "book.spectrum.guidebook.infused_beverages.page17.title": "Artemisa & Advocaat",
-  "book.spectrum.guidebook.infused_beverages.page18.title": "Damassine & Hare Bane",
-  "book.spectrum.guidebook.infused_beverages.page19.text": "Only gets stronger with age. Just one question: How deadly do I want it to be today?",
-  "book.spectrum.guidebook.infused_beverages.page2.text": "- Humidity: The more humid the air, the more water will evaporate compared to the alcohol, making the drink stronger\n- Water Share: A higher ratio of ingredients to water is a fine balance, but one to be played with. A higher thickness makes the drink ferment faster, albeit at the cost of shorter duration status effects",
-  "book.spectrum.guidebook.infused_beverages.page20.text": "Only gets stronger with age. Tastes like a bar fight.",
-  "book.spectrum.guidebook.infused_beverages.page21.text": "Wonderfully light in the mouth. A soft, sweet burn, which lets me forget my worries for a bit. In return, the things that worry me will forget me for a bit, too.\\\n\\\n*Tastes like walking on the moon.*",
-  "book.spectrum.guidebook.infused_beverages.page22.text": "More spicy than it looks.",
-  "book.spectrum.guidebook.infused_beverages.page23.text": "An interesting combination of all things Deeper Down. Best drunk while still hot!",
-  "book.spectrum.guidebook.infused_beverages.page26.text": "My memory doesn't always work, it seems. Somehow I ended up with this bottle. Definitely got a *little* stronger than planned...\\\nMore to disinfect than to drink.",
+   "book.spectrum.guidebook.infused_beverages.page0.text": "Brewing is art!\\\nThere is so much to vary and try out that I probably won't finish trying out all the possible combinations in my lifetime.\\\nThey not only differ in their taste, but also in their effects.",
+  "book.spectrum.guidebook.infused_beverages.page11.text": "A strong flavor, enhanced by the influence of the colored wood. Grants [#](449900)Absorption[#]() and [#](449900)Resistance[#]().",
+  "book.spectrum.guidebook.infused_beverages.page12.text": "The high sugar content in honey is perfect for fermentation. The result is a strong, but still sweet drink.",
+  "book.spectrum.guidebook.infused_beverages.page13.text": "Fermented apples, usually sweet and sparkling, with a slight sour note - if I do not forget to tap it soon enough.",
+  "book.spectrum.guidebook.infused_beverages.page14.text": "Much stronger compared to their common counterparts. Won't go bad over time and taste glorious.",
+  "book.spectrum.guidebook.infused_beverages.page15.text": "A much more fruity cider than the apple one. The glowy variant seems to ferment a bit faster, but also... makes me glow. Hmm.",
+  "book.spectrum.guidebook.infused_beverages.page16.text": "Berries can also be used to make liqueur. Way more viscous, sweet and strong, but takes longer to ferment.",
+  "book.spectrum.guidebook.infused_beverages.page17.text": "*Liquid Luck*",
+  "book.spectrum.guidebook.infused_beverages.page20.text": "Only gets stronger with age. Just one question: How deadly do I want it to be today?",
+  "book.spectrum.guidebook.infused_beverages.page21.text": "Only gets stronger with age. Tastes like a bar fight.",
+  "book.spectrum.guidebook.infused_beverages.page22.text": "Wonderfully light in the mouth. A soft, sweet burn, which lets me forget my worries for a bit. In return, the things that worry me will forget me for a bit, too.\\\n\\\n*Tastes like walking on the moon.*",
+  "book.spectrum.guidebook.infused_beverages.page23.text": "More spicy than it looks.",
+  "book.spectrum.guidebook.infused_beverages.page24.text": "An interesting combination of all things Deeper Down. Best drunk while still hot!",
   "book.spectrum.guidebook.infused_beverages.page3.text": "Filling and tastes both sweet and savory. What a lovely combination.",
-  "book.spectrum.guidebook.infused_beverages.page4.text": "Sweet with a cinnamon finish",
-  "book.spectrum.guidebook.infused_beverages.page5.button_text": "I confirm",
-  "book.spectrum.guidebook.infused_beverages.page5.button_text_confirmed": "Confirmed ✔",
-  "book.spectrum.guidebook.infused_beverages.page5.text": "The [Titration Barrel](entry://cuisine/titration_barrel) is capable of brewing alcoholic beverages. If you are of legal drinking age in your country, you can press the button below to unlock these recipes.\\\nIf not don't worry - you won't miss out on anything important.",
-  "book.spectrum.guidebook.infused_beverages.page5.title": "Safety Question",
-  "book.spectrum.guidebook.infused_beverages.page6.text": "In addition to Haste it can grant a bit of Saturation, depending on how long it fermented.",
-  "book.spectrum.guidebook.infused_beverages.page6.title": "Beers & Ale",
-  "book.spectrum.guidebook.infused_beverages.page7.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
+  "book.spectrum.guidebook.infused_beverages.page4.text": "Refreshing, but leaves a bitter taste in my mouth.",
+  "book.spectrum.guidebook.infused_beverages.page5.text": "Sweet with a cinnamon finish.",
+  "book.spectrum.guidebook.infused_beverages.page6.text": "Makes me drowsy enough to sleep through the day.",
+  "book.spectrum.guidebook.infused_beverages.page7.text": "In addition to Haste it can grant a bit of Saturation, depending on how long it fermented.",
   "book.spectrum.guidebook.infused_beverages.page8.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
-  "book.spectrum.guidebook.infused_beverages.page9.text": "Made from [Amaranth](entry://cuisine/amaranth), grants [#](449900)Luck[#]() and [#](449900)Haste[#]().",
+  "book.spectrum.guidebook.infused_beverages.page9.text": "Just... don't brew them too long or they will shift and end up tasting awful.",
+  "book.spectrum.guidebook.infused_beverages.page10.text": "Made from [Amaranth](entry://cuisine/amaranth), grants [#](449900)Luck[#]() and [#](449900)Haste[#]().",
+  "book.spectrum.guidebook.infused_beverages.poisonous_vodka.title": "...and a special variant",
   "book.spectrum.guidebook.jade_wine.page0.text": "Since the [Jade Vines](entry://general/jade_vines)[#]() are notorious for their restorative properties, it's no wonder they translate perfectly when fermented.\\\nIn contrast to the slight bitterness of the bulbs, adding a good portion of petals brings out a more floral and slightly tart flavor, complemented by earthy undertones - almost resembling wine, in their characteristic jade color.",
   "book.spectrum.guidebook.jade_wine.page1.text": "[#](bb00bb)1 Bulb[#]() and [#](bb00bb)3 Petals[#]() for the [#](bb00bb)Bucket of Water[#]() feel like a good starting point.\\\nThe longer the fermentation goes on, the stronger the taste gets.\\\n\\\n*A bit of [#](bb00bb)added sweetness[#]()* would do it good, I'm sure.",
   "book.spectrum.guidebook.jade_wine.page2.text": "Adding a drop of [#](bb00bb)Moonstruck Nectar[#]() made the wine much easier to drink. The fermentation process is accelerated and negative effects are noticeably mitigated.",
@@ -4595,6 +4585,7 @@
   "item.spectrum.infused_beverage.tooltip.variant.rabbit_poison": "Rabbit Poison",
   "item.spectrum.infused_beverage.tooltip.variant.rum": "Rum",
   "item.spectrum.infused_beverage.tooltip.variant.sake": "Sake",
+  "item.spectrum.infused_beverage.tooltip.variant.sarsaparilla": "Salsaparrilha",
   "item.spectrum.infused_beverage.tooltip.variant.sawblade_holly_cider": "Sawblade Holly Cider",
   "item.spectrum.infused_beverage.tooltip.variant.sawblade_holly_liquor": "Sawblade Holly Liquor",
   "item.spectrum.infused_beverage.tooltip.variant.spiked_mullet_wine": "Spiked Mullet Wine",