From 09020746903d3eab7f0eef9963081a0801ba5ac5 Mon Sep 17 00:00:00 2001 From: Yandols ZeonX Date: Tue, 7 May 2019 04:47:23 +0800 Subject: [PATCH] Updated Nutrition mod to 4.3.0. --- config/nutrition/effects/example.json | 3 +- config/nutrition/nutrients/dairy.json | 16 ++++ config/nutrition/nutrients/fruit.json | 46 ++++++++++- config/nutrition/nutrients/grain.json | 34 ++++++++ config/nutrition/nutrients/protein.json | 98 +++++++++++++++++++++++ config/nutrition/nutrients/vegetable.json | 80 ++++++++++++++++++ config/nutrition/nutrition.cfg | 2 +- config/nutrition/nutrition.cfg.bak | 77 ------------------ 8 files changed, 275 insertions(+), 81 deletions(-) delete mode 100644 config/nutrition/nutrition.cfg.bak diff --git a/config/nutrition/effects/example.json b/config/nutrition/effects/example.json index 9ec3dba..bd90cd4 100644 --- a/config/nutrition/effects/example.json +++ b/config/nutrition/effects/example.json @@ -4,7 +4,7 @@ "amplifier": 0, // Potion strength "minimum": 75, // Minimum nutrition level to take effect "maximum": 100, // Maximum nutrition level to take effect - "detect": "any", // Accepted values: + "detect": "any", // Detection type. Accepted values: // 'any': Any nutrient may be in the threshold // 'average': The average of all nutrients must be in the threshold // 'all': All nutrients must be in the threshold @@ -14,5 +14,6 @@ "vegetable" // ], // "cumulative_modifier": 1, // Amount to increase the amplifier by for each cumulative effect + "particles": "transparent", // Particle visibility: 'transparent' (default), 'translucent', or 'opaque' "enabled": false // Will this effect be active or not } diff --git a/config/nutrition/nutrients/dairy.json b/config/nutrition/nutrients/dairy.json index ff084f7..4d83462 100644 --- a/config/nutrition/nutrients/dairy.json +++ b/config/nutrition/nutrients/dairy.json @@ -24,6 +24,7 @@ "animania:milk_bottle", "animania:super_omelette", "arcticmobs:palesoup", + "betteranimalsplus:goatcheese", "betterwithmods:chowder", "betterwithmods:cooked_scrambled_egg", "betterwithmods:raw_scrambled_egg", @@ -72,6 +73,11 @@ "dcs_climate:dcs_food_tart:9", "dcs_climate:dcs_food_wagashi:3", "duckcraft:ducktacoitem", + "faunaandecology:bucket_curdle", + "faunaandecology:bucket_curdle_fatty", + "faunaandecology:bucket_fatty_milk", + "faunaandecology:cheese_cow", + "faunaandecology:cheese_fatty", "foodexpansion:itemblazecream", "foodexpansion:itemchocolatebar", "galacticraftcore:cheese_curd", @@ -135,6 +141,7 @@ "harvestcraft:brownieitem", "harvestcraft:buttercookieitem", "harvestcraft:butteredpotatoitem", + "harvestcraft:caramelcupcakeitem", "harvestcraft:caramelicecreamitem", "harvestcraft:carrotcupcakeitem", "harvestcraft:carrotsoupitem", @@ -403,6 +410,12 @@ "tconstruct:edible:31", "tconstruct:edible:32", "tconstruct:edible:34", + "teastory:milk_tea:0", + "teastory:milk_tea:2", + "teastory:milk_tea:3", + "teastory:milk_tea:4", + "teastory:milk_tea:5", + "tp:slime_juice", "vanillafoodpantry:bucket_sweetened_milk", "vanillafoodpantry:cake_slice", "vanillafoodpantry:cheese_ball", @@ -460,6 +473,8 @@ "vanillafoodpantry:tatoes:11", "vanillafoodpantry:teadrink:201", "vanillafoodpantry:teadrink:202", + "xlfoodmod:bourbon_biscuit", + "xlfoodmod:breakfast_sandwich", "xlfoodmod:burrito", "xlfoodmod:butter", "xlfoodmod:butter_rice", @@ -475,6 +490,7 @@ "xlfoodmod:crouton", "xlfoodmod:enchilada", "xlfoodmod:garden_salad", + "xlfoodmod:grilled_cheese_sandwich", "xlfoodmod:icecream_sandwich", "xlfoodmod:jambon_beurre", "xlfoodmod:lasagne", diff --git a/config/nutrition/nutrients/fruit.json b/config/nutrition/nutrients/fruit.json index 42dd4d5..9081cba 100644 --- a/config/nutrition/nutrients/fruit.json +++ b/config/nutrition/nutrients/fruit.json @@ -45,6 +45,9 @@ "betterwithaddons:food_mulberry", "betterwithaddons:food_pie_melon", "betterwithmods:apple_pie", + "bewitchment:grilled_watermelon", + "bewitchment:juniper_berries", + "bewitchment:yew_aril", "biomesoplenty:berries", "dcs_climate:dcs_food_bowl_stew:7", "dcs_climate:dcs_food_cake:4", @@ -82,6 +85,11 @@ "foodexpansion:itemmelonsalad", "galacticraftcore:food:0", "galacticraftcore:food:2", + "glacidus:grapes", + "glacidus:raisins", + "grimoireofgaia:food_nether_wart", + "grimoireofgaia:food_pie_apple_gold", + "grimoireofgaia:food_small_apple_gold", "grimpack:apple_pie", "grimpack:dragon_fruit", "grimpack:melon_pie", @@ -376,6 +384,11 @@ "jurassicraft:phoenix_fruit", "jurassicraft:rhamnus_salicifolius_berries", "jurassicraft:west_indian_lilac_berries", + "midnight:cook_suavis", + "midnight:raw_suavis", + "midnight:unstable_fruit_blue", + "midnight:unstable_fruit_green", + "midnight:unstable_fruit_lime", "minecraft:apple", "minecraft:chorus_fruit", "minecraft:golden_apple:0", @@ -463,6 +476,7 @@ "primal:valus_melon", "pvj:coconut_milk", "pvj:cracked_coconut", + "pvj:juniper_berries", "realworld:berry_acai", "realworld:berry_beaut", "realworld:berry_black", @@ -502,7 +516,11 @@ "realworld:fruit_tange", "realworld:fruit_yelap", "rockhounding_surface:purplepear_jam", + "rockhounding_surface:purplepear_juice", + "rockhounding_surface:purplepear_smoothie", + "rockhounding_surface:sourberry_juice", "rockhounding_surface:sourberry_pie", + "rockhounding_surface:sourberry_smoothie", "rockhounding_surface:sourberry_tea", "rockhounding_surface:truffle_pumpkin", "rootsclassic:blackcurrant", @@ -548,6 +566,11 @@ "skyesdonuts:strawberrydonut", "skyesdonuts:strawberryfrosteddonut", "skyesdonuts:tigerdonut", + "teastory:lemon_tea:0", + "teastory:lemon_tea:2", + "teastory:lemon_tea:3", + "teastory:lemon_tea:4", + "teastory:lemon_tea:5", "thebetweenlands:christmas_pudding", "thebetweenlands:forbidden_fig", "thebetweenlands:gerts_donut", @@ -555,6 +578,27 @@ "thebetweenlands:middle_fruit", "thebetweenlands:middle_fruit_jello", "thebetweenlands:mince_pie", + "thebetweenlands:spirit_fruit", + "tp:apple_juice", + "tp:blackberry_berry", + "tp:blackberry_juice", + "tp:blueberry_berry", + "tp:blueberry_juice", + "tp:cooked_apple", + "tp:diamond_apple", + "tp:emerald_apple", + "tp:iron_apple", + "tp:maloberry_berry", + "tp:maloberry_juice", + "tp:melon_juice", + "tp:peach_juice", + "tp:pear_juice", + "tp:plump_peach", + "tp:plump_pear", + "tp:pumpkin_juice", + "tp:raspberry_berry", + "tp:raspberry_juice", + "tp:redstone_apple", "tropicraft:coconut_chunk", "tropicraft:grapefruit", "tropicraft:lemon", @@ -616,8 +660,6 @@ "xlfoodmod:strawberry_pie", "xlfoodmod:taco", "xlfoodmod:taco_salad", - "xlfoodmod:tomato", - "xlfoodmod:tomato_soup", "xlfoodmod:vegetable_soup" ] } diff --git a/config/nutrition/nutrients/grain.json b/config/nutrition/nutrients/grain.json index e77db79..763e0fd 100644 --- a/config/nutrition/nutrients/grain.json +++ b/config/nutrition/nutrients/grain.json @@ -52,12 +52,17 @@ "actuallyadditions:item_jam:3", "aether_legacy:ginger_bread_man", "aquaculture:food:6", + "ashenwheat:ashbread", + "ashenwheat:ashcookie", + "ashenwheat:scintillabread", + "ashenwheat:scintillacookie", "betterwithaddons:food_bowl_rice", "betterwithaddons:food_cooked_rice", "betterwithmods:apple_pie", "betterwithmods:donut", "betterwithmods:hearty_stew", "betterwithmods:tasty_sandwich", + "bewitchment:infested_wheat", "dcs_climate:dcs_food_bread:0", "dcs_climate:dcs_food_bread:1", "dcs_climate:dcs_food_bread:2", @@ -140,12 +145,16 @@ "duckcraft:duckpotpieitem", "duckcraft:ducktacoitem", "erebus:honey_treat", + "faunaandecology:cooked_pumpkin_seeds", "foodexpansion:itembeetrootnoodles", "foodexpansion:itemcarrotpie", "foodexpansion:itemroastedseed", "forestry:honeyed_slice", "galacticraftcore:food:5", "galacticraftcore:food:8", + "grimoireofgaia:food_pie_apple_gold", + "grimoireofgaia:food_pie_mandrake", + "grimoireofgaia:food_pie_meat", "grimpack:apple_pie", "grimpack:bread_slice", "grimpack:cheese_burger", @@ -208,6 +217,7 @@ "harvestcraft:candiedsweetpotatoesitem", "harvestcraft:candiedwalnutsitem", "harvestcraft:cantonesenoodlesitem", + "harvestcraft:caramelcupcakeitem", "harvestcraft:carrotcakeitem", "harvestcraft:cashewchickenitem", "harvestcraft:ceasarsaladitem", @@ -590,7 +600,11 @@ "realworld:seedf_rice", "realworld:soup_quino", "rockhounding_surface:mesquite_liquor", + "rockhounding_surface:mesquite_pie", + "rockhounding_surface:mush", "rockhounding_surface:sotol", + "rockhounding_surface:truffle_canape", + "rockhounding_surface:truffle_rice", "rockhounding_surface:truffle_toast", "rootsclassic:rootystew", "saltmod:bop_salt_rice_bowl", @@ -701,7 +715,24 @@ "skyesdonuts:vanillafrosteddonut", "skyesdonuts:whitechocolatedonut", "skyesdonuts:yellowfruitedicedtea", + "teastory:chicken_rice", + "teastory:matcha_cookie", + "teastory:porkchop_rice", + "teastory:potato_rice", + "teastory:rabbit_rice", + "teastory:rice_ball", + "teastory:steak_rice", "thebetweenlands:christmas_pudding", + "tp:bacon_eggs_sandwhich", + "tp:bacon_sandwhich", + "tp:bams_pizza", + "tp:beef_sandwhich", + "tp:bread_slice", + "tp:bsc_sugar_cookie", + "tp:chicken_sandwhich", + "tp:rabbit_sandwhich", + "tp:toasted_bread", + "tp:wheat_juice", "twilightforest:maze_wafer", "vanillafoodpantry:acornmeal_portion", "vanillafoodpantry:bat_burger", @@ -756,6 +787,7 @@ "xlfoodmod:beer", "xlfoodmod:blt_sandwich", "xlfoodmod:bottom_bun", + "xlfoodmod:breakfast_sandwich", "xlfoodmod:brownie", "xlfoodmod:burrito", "xlfoodmod:butter_rice", @@ -786,6 +818,7 @@ "xlfoodmod:fish_pie", "xlfoodmod:fried_rice", "xlfoodmod:golden_apple_pie", + "xlfoodmod:grilled_cheese_sandwich", "xlfoodmod:hamburger", "xlfoodmod:hot_dog", "xlfoodmod:icecream_cone", @@ -804,6 +837,7 @@ "xlfoodmod:pumpkin_cake", "xlfoodmod:rice", "xlfoodmod:salty_chips", + "xlfoodmod:sausage_roll", "xlfoodmod:slice_of_pizza", "xlfoodmod:spaghetti", "xlfoodmod:spicy_chips", diff --git a/config/nutrition/nutrients/protein.json b/config/nutrition/nutrients/protein.json index 5254b78..075e8a5 100644 --- a/config/nutrition/nutrients/protein.json +++ b/config/nutrition/nutrients/protein.json @@ -127,6 +127,7 @@ "betterwithmods:raw_scrambled_egg", "betterwithmods:tasty_sandwich", "betterwithmods:wolf_chop", + "bewitchment:heart", "chococraft:chocobo_drumstick_cooked", "chococraft:chocobo_drumstick_raw", "combustfish:cooled_cod", @@ -258,12 +259,46 @@ "erebus:smoothie:8", "erebus:smoothie:9", "erebus:stag_heart_cooked", + "erebus:stag_heart_raw", "exoticbirds:birdmeat", "exoticbirds:cooked_birdmeat", "familiarfauna:turkey_leg_cooked", "familiarfauna:turkey_leg_raw", "familiarfauna:venison_cooked", "familiarfauna:venison_raw", + "faunaandecology:bat_stew", + "faunaandecology:bat_stew_raw", + "faunaandecology:beef_aurochs_raw", + "faunaandecology:beef_mooshroom_raw", + "faunaandecology:beef_wild_mooshroom_raw", + "faunaandecology:bone_marrow", + "faunaandecology:calamari", + "faunaandecology:cooked_bat", + "faunaandecology:cooked_bone_marrow", + "faunaandecology:cooked_calamari", + "faunaandecology:cooked_donkey_meat", + "faunaandecology:cooked_horse_meat", + "faunaandecology:cooked_llama_meat", + "faunaandecology:cooked_zebra_meat", + "faunaandecology:donkey_meat", + "faunaandecology:duck_cooked", + "faunaandecology:duck_raw", + "faunaandecology:fried_egg", + "faunaandecology:guanaco_meat", + "faunaandecology:horse_meat", + "faunaandecology:junglefowl_raw", + "faunaandecology:llama_meat", + "faunaandecology:mallard_raw", + "faunaandecology:mushroom_stew_raw", + "faunaandecology:mutton_mouflon_raw", + "faunaandecology:porkchop_boar_raw", + "faunaandecology:quagga_meat", + "faunaandecology:rabbit_stew_raw", + "faunaandecology:raw_bat", + "faunaandecology:rind_pork", + "faunaandecology:wild_ass_meat", + "faunaandecology:wild_horse_meat", + "faunaandecology:zebra_meat", "faunanatural:meat_cookedstingray", "faunanatural:meat_rawstingray", "foodexpansion:itembacon", @@ -294,11 +329,26 @@ "forestry:honeyed_slice", "forestry:honey_pot", "freshwatermobs:lapisfishandchips", + "gaiadimension:cooked_luggeroth_chop", + "gaiadimension:large_calamari", + "gaiadimension:large_tentacle", + "gaiadimension:luggeroth_chop", + "gaiadimension:lurmorus_meat", + "gaiadimension:lurmorus_steak", + "gaiadimension:small_calamari", + "gaiadimension:small_tentacle", "galacticraftcore:food:5", "galacticraftcore:food:6", "galacticraftcore:food:7", "galacticraftcore:food:8", "galacticraftcore:food:9", + "glacidus:grilled_porcali_meat", + "glacidus:raw_porcali_meat", + "grimoireofgaia:food_coalfish", + "grimoireofgaia:food_meat", + "grimoireofgaia:food_pie_meat", + "grimoireofgaia:food_rotten_heart", + "grimoireofgaia:food_wither", "grimpack:apple_pie", "grimpack:cheese_burger", "grimpack:chocolate_cake", @@ -608,6 +658,7 @@ "harvestcraft:shepardspieitem", "harvestcraft:shrimpcocktailitem", "harvestcraft:shrimpokrahushpuppiesitem", + "harvestcraft:slimegummiesitem", "harvestcraft:snickersbaritem", "harvestcraft:southernstylebreakfastitem", "harvestcraft:spagettiandmeatballsitem", @@ -690,6 +741,12 @@ "jurassicraft:goat_raw", "lycanitesmobs:battleburrito", "lycanitesmobs:explorersrisotto", + "midnight:cook_hunter_wing", + "midnight:cook_stag_flank", + "midnight:cook_stinger_egg", + "midnight:deceitful_snapper", + "midnight:hunter_wing", + "midnight:raw_stag_flank", "minecraft:beef", "minecraft:cake", "minecraft:chicken", @@ -712,6 +769,18 @@ "minecraft:rabbit_stew", "mob_mash:cooked_crocoduck", "mob_mash:raw_crocoduck", + "mocreatures:crabcooked", + "mocreatures:crabraw", + "mocreatures:omelet", + "mocreatures:ostrichcooked", + "mocreatures:ostrichraw", + "mocreatures:ratburger", + "mocreatures:ratcooked", + "mocreatures:ratraw", + "mocreatures:turkeycooked", + "mocreatures:turkeyraw", + "mocreatures:turtleraw", + "mocreatures:turtlesoup", "mountainmobs:peakskebab", "mountainmobs:yalemeatcooked", "mountainmobs:yalemeatraw", @@ -835,6 +904,10 @@ "primal:wolf_meat_salted", "primitivemobs:cooked_dodo", "primitivemobs:dodo", + "pvj:clam", + "pvj:clam_chowder", + "pvj:cooked_duck", + "pvj:cooked_squid", "pvj:mystical_beef", "pvj:mystical_chicken", "pvj:mystical_cod", @@ -842,6 +915,9 @@ "pvj:mystical_porkchop", "pvj:mystical_rabbit", "pvj:mystical_salmon", + "pvj:raw_duck", + "pvj:raw_squid", + "pvj:steamed_clam_meat", "realworld:food_cotof", "realworld:food_cotom", "realworld:food_pbcoo", @@ -885,7 +961,10 @@ "reptilemod:turtle_cooked", "reptilemod:turtle_raw", "rockhounding_surface:mesquite_fruit", + "rockhounding_surface:mesquite_pie", "rockhounding_surface:sourberry_pie", + "rockhounding_surface:truffle_canape", + "rockhounding_surface:truffle_fillet", "rockhounding_surface:truffle_omelette", "saltmod:apple_pie", "saltmod:carrot_pie", @@ -947,6 +1026,11 @@ "tconstruct:edible:22", "tconstruct:edible:23", "tconstruct:edible:33", + "teastory:chicken_rice", + "teastory:porkchop_rice", + "teastory:rabbit_rice", + "teastory:steak_rice", + "teastory:tea_egg", "thaumcraft:brain", "thaumcraft:chunk:0", "thaumcraft:chunk:1", @@ -957,6 +1041,7 @@ "thaumcraft:triple_meat_treat", "thebetweenlands:angler_meat_cooked", "thebetweenlands:angler_meat_raw", + "thebetweenlands:chiromaw_wing", "thebetweenlands:crab_stick", "thebetweenlands:frog_legs_cooked", "thebetweenlands:frog_legs_raw", @@ -969,6 +1054,15 @@ "thebetweenlands:snail_flesh_cooked", "thebetweenlands:snail_flesh_raw", "thebetweenlands:wight_heart", + "tp:bacon_eggs_sandwhich", + "tp:bacon_sandwhich", + "tp:beef_sandwhich", + "tp:chicken_sandwhich", + "tp:cooked_bacon", + "tp:fried_egg", + "tp:monster_jerky", + "tp:rabbit_sandwhich", + "tp:raw_bacon", "tropicraft:cooked_fish", "tropicraft:cooked_frog_leg", "tropicraft:cooked_river_fish", @@ -1102,6 +1196,7 @@ "xlfoodmod:beef_jerky", "xlfoodmod:beef_stew", "xlfoodmod:blt_sandwich", + "xlfoodmod:breakfast_sandwich", "xlfoodmod:bucket_of_fried_chicken", "xlfoodmod:burrito", "xlfoodmod:caesar_salad", @@ -1130,6 +1225,7 @@ "xlfoodmod:pumpkin_stew", "xlfoodmod:raw_chicken_wing", "xlfoodmod:sausage", + "xlfoodmod:sausage_roll", "xlfoodmod:spaghetti", "xlfoodmod:spicy_chicken_wing", "xlfoodmod:strawberry_cake", @@ -1146,6 +1242,8 @@ "zawa:cooked_frog_leg", "zawa:large_meat_cooked", "zawa:large_meat_raw", + "zawa:rat_cooked", + "zawa:rat_raw", "zawa:raw_frog_leg", "zawa:reptile_meat_cooked", "zawa:reptile_meat_raw" diff --git a/config/nutrition/nutrients/vegetable.json b/config/nutrition/nutrients/vegetable.json index 17ba34c..e06c0d5 100644 --- a/config/nutrition/nutrients/vegetable.json +++ b/config/nutrition/nutrients/vegetable.json @@ -5,6 +5,9 @@ "enabled": true, "food": { "oredict": [ + "cropFlax", + "cropJute", + "cropSisal", "cropSunflower", "cropTea", "cropTruffle", @@ -21,8 +24,10 @@ "foodVegetable", "foodVeggiesalad", "listAllgreenveggie", + "listAllherb", "listAllmushroom", "listAllpepper", + "listAllspice", "listAllveggie" ], "items": [ @@ -34,6 +39,7 @@ "actuallyadditions:item_food:14", "animania:chocolate_truffle", "animania:super_omelette", + "animania:truffle", "animania:truffle_omelette", "animania:truffle_soup", "aquaculture:food", @@ -57,6 +63,16 @@ "betterwithmods:pork_dinner", "betterwithmods:raw_kebab", "betterwithmods:raw_omelet", + "bewitchment:aconitum", + "bewitchment:asphodel", + "bewitchment:belladonna", + "bewitchment:chrysanthemum", + "bewitchment:hellebore", + "bewitchment:kenaf", + "bewitchment:mandrake_root", + "bewitchment:sagebrush", + "bewitchment:thistle", + "bewitchment:white_sage", "caveroot:cave_root", "chococraft:gysahl_green", "chococraft:pickled_gysahl_cooked", @@ -138,6 +154,8 @@ "erebus:smoothie:7", "erebus:smoothie:9", "erebus:turnip", + "faunaandecology:bat_stew", + "faunaandecology:bat_stew_raw", "foodexpansion:itembeetrootnoodles", "foodexpansion:itemcarrotpie", "foodexpansion:itemcarrotseedsoup", @@ -146,8 +164,12 @@ "forestmobs:arisaurmeatraw", "forestmobs:paleosalad", "freshwatermobs:lapisfishandchips", + "gaiadimension:markuzar_mint", "galacticraftcore:food:1", "galacticraftcore:food:3", + "grimoireofgaia:food_mandrake", + "grimoireofgaia:food_pie_mandrake", + "grimoireofgaia:food_root", "harvestcraft:anchovypepperonipizzaitem", "harvestcraft:asparagusquicheitem", "harvestcraft:asparagussoupitem", @@ -439,6 +461,7 @@ "harvestcraft:shepardspieitem", "harvestcraft:shrimpcocktailitem", "harvestcraft:shrimpokrahushpuppiesitem", + "harvestcraft:slimegummiesitem", "harvestcraft:slimepieitem", "harvestcraft:sourcreamandonionpotatochipsitem", "harvestcraft:spagettiandmeatballsitem", @@ -517,6 +540,7 @@ "jurassicraft:wild_potato", "jurassicraft:wild_potato_cooked", "lycanitesmobs:battleburrito", + "midnight:bulb_fungus_hand", "minecraft:baked_potato", "minecraft:beetroot", "minecraft:beetroot_soup", @@ -639,6 +663,7 @@ "primal:sinuous_resin", "primal:sinuous_spore", "primal:void_grass_root", + "pvj:cactus_salad", "pvj:mystical_potato", "realworld:food_corbr", "realworld:food_corto", @@ -712,9 +737,14 @@ "realworld:veget_watcr", "rockhounding_surface:mesquite_flower", "rockhounding_surface:mesquite_tea", + "rockhounding_surface:mush", + "rockhounding_surface:truffle_canape", + "rockhounding_surface:truffle_fillet", "rockhounding_surface:truffle_omelette", "rockhounding_surface:truffle_pumpkin", + "rockhounding_surface:truffle_rice", "rockhounding_surface:truffle_toast", + "rockhounding_surface:truffle_tomato", "rockhounding_surface:truffle_vodka", "roots:aubergine_item", "rootsclassic:oldroot", @@ -776,6 +806,47 @@ "skyesdonuts:tea", "skyesdonuts:vanillachai", "swampmobs:mosspie", + "teastory:black_tea:0", + "teastory:black_tea:2", + "teastory:black_tea:3", + "teastory:black_tea:4", + "teastory:black_tea:5", + "teastory:green_tea:0", + "teastory:green_tea:2", + "teastory:green_tea:3", + "teastory:green_tea:4", + "teastory:green_tea:5", + "teastory:matcha_drink:0", + "teastory:matcha_drink:2", + "teastory:matcha_drink:3", + "teastory:matcha_drink:4", + "teastory:matcha_drink:5", + "teastory:oolong_tea:0", + "teastory:oolong_tea:2", + "teastory:oolong_tea:3", + "teastory:oolong_tea:4", + "teastory:oolong_tea:5", + "teastory:potato_rice:0", + "teastory:potato_rice:2", + "teastory:potato_rice:3", + "teastory:potato_rice:4", + "teastory:potato_rice:5", + "teastory:puer_tea:0", + "teastory:puer_tea:2", + "teastory:puer_tea:3", + "teastory:puer_tea:4", + "teastory:puer_tea:5", + "teastory:tea_egg", + "teastory:white_tea:0", + "teastory:white_tea:2", + "teastory:white_tea:3", + "teastory:white_tea:4", + "teastory:white_tea:5", + "teastory:yellow_tea:0", + "teastory:yellow_tea:2", + "teastory:yellow_tea:3", + "teastory:yellow_tea:4", + "teastory:yellow_tea:5", "thebetweenlands:black_hat_mushroom_item", "thebetweenlands:bulb_capped_mushroom_item", "thebetweenlands:flat_head_mushroom_item", @@ -790,6 +861,13 @@ "thebetweenlands:weeping_blue_petal", "thebetweenlands:weeping_blue_petal_salad", "thebetweenlands:yellow_dotted_fungus", + "tp:beet_juice", + "tp:cactus_juice", + "tp:carrot_juice", + "tp:cooked_mushroom_brown", + "tp:cooked_mushroom_red", + "tp:dead_reed", + "tp:potatoe_juice", "tropicraft:nori_toasted", "vanillafoodpantry:breads:413", "vanillafoodpantry:breads:417", @@ -899,6 +977,8 @@ "xlfoodmod:raw_corn", "xlfoodmod:taco", "xlfoodmod:taco_salad", + "xlfoodmod:tomato", + "xlfoodmod:tomato_soup", "xlfoodmod:tortilla", "xlfoodmod:vegetable_soup", "zawa:bamboo_shoot", diff --git a/config/nutrition/nutrition.cfg b/config/nutrition/nutrition.cfg index 842a1e0..38f0dca 100644 --- a/config/nutrition/nutrition.cfg +++ b/config/nutrition/nutrition.cfg @@ -50,7 +50,7 @@ logging { nutrition { # Allow player to continue eating even while full. - # This setting may upset balance, but is necessary for playing in peaceful mode. [default: false] + # This setting may upset balance (and tummies), but is necessary for playing in peaceful mode. [default: false] B:AllowOverEating=false # The nutrition value subtracted from foods per additional nutrient, as a percentage. diff --git a/config/nutrition/nutrition.cfg.bak b/config/nutrition/nutrition.cfg.bak deleted file mode 100644 index c55c6b4..0000000 --- a/config/nutrition/nutrition.cfg.bak +++ /dev/null @@ -1,77 +0,0 @@ -# Configuration file - -"death penalty" { - # The nutrition value subtracted from each nutrient upon death. [range: 0 ~ 100, default: 15] - I:DeathPenaltyLoss=15 - - # The minimum nutrition value that the death penalty may reduce to. [range: 0 ~ 100, default: 30] - I:DeathPenaltyMin=30 - - # On death, should nutrition be reset to DeathPenaltyMin if it's fallen below that value? - # This is recommended to prevent death loops caused by negative effects. [default: true] - B:DeathPenaltyReset=true -} - - -gui { - # The anchor defines which side of the origin to position the button against. - # Accepted values: top, right, bottom, left, top-left, top-right, bottom-right, bottom-left, center [default: top-left] - S:ButtonAnchor=top-left - - # The origin defines the object which the nutrition button will be placed relative to. - # Accepted values: gui, screen [default: gui] - S:ButtonOrigin=gui - - # The nutrition button's X position, relative to its anchor point. [range: -1000 ~ 1000, default: 134] - I:ButtonXPosition=134 - - # The nutrition button's Y position, relative to its anchor point. [range: -1000 ~ 1000, default: 61] - I:ButtonYPosition=61 - - # If the nutrition GUI should be enabled [default: true] - B:EnableGui=true - - # If the nutrition button should be shown on player inventory (hotkey will still function). [default: true] - B:EnableGuiButton=true - - # If foods should show their nutrients on hover. [default: true] - B:EnableTooltips=true -} - - -logging { - # Log foods which cannot be found but are still listed in nutrients file. [default: false] - B:LogMissingFood=false - - # Log foods which have been found but do not have any associated nutrients. [default: false] - B:LogMissingNutrients=false -} - - -nutrition { - # Allow player to continue eating even while full. - # This setting may upset balance, but is necessary for playing in peaceful mode. [default: false] - B:AllowOverEating=false - - # The nutrition value subtracted from foods per additional nutrient, as a percentage. - # This is to prevent large, complex foods from being too powerful. - # (eg. 1 nutrient = 0% loss, 2 nutrients = 15% loss, 3 nutrients = 30% loss) [range: 0 ~ 100, default: 15] - I:LossPerNutrient=15 - - # Value to multiply base nutrition by for each food (eg. 0.5 to halve nutrition gain). [range: 0.0 ~ 100.0, default: 1.0] - S:NutritionMultiplier=1.0 - - # The starting nutrition level for new players. [range: 0 ~ 100, default: 50] - I:StartingNutrition=50 -} - - -"nutrition decay" { - # Global value to multiply decay rate by (eg. 0.5 halves the rate, 2.0 doubles it). This can also be set per-nutrient. [range: -100.0 ~ 100.0, default: 1.0] - S:DecayMultiplier=1.0 - - # Enable nutrition decay when hunger drains. [default: true] - B:EnableDecay=true -} - -