diff --git a/CHANGELOG.md b/CHANGELOG.md index 18509ff..0ac6141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,21 @@ ## Changed: -- Default max nutrition from 100 -> 300 +- Minerals negative effect from `mining fatique` -> `nausea` +- Now all datapacks are valid throughout minecraft versions +- Dropped support for standalone legacy lets do mods ## Added: -- Bountiful Fares `1.2.1` compat -- Culinaire `3.0.0` compat -- Exline's Fishing `1.0.4` compat -- Living Things `2.0.2` compat -- Natures Delight `1.2` compat \ No newline at end of file +- [Let's Do Addon] Corn Expansion `1.0.1` compat +- [Let's Do] Bakery - Farm&Charm Compat `2.0.1` compat +- [Let's Do] Brewery - Farm&Charm Compat `2.0.2` compat +- [Let's Do] Candlelight - Farm&Charm Compat `2.0.1` compat +- [Let's Do] Farm & Charm `1.0.2` compat +- [Let's Do] WilderNature `1.0.2` compat + +## Removed: +- Legacy: [Let's Do] Bakery compat +- Legacy: [Let's Do] Brewery compat +- Legacy: [Let's Do] Candlelight compat + +## Updated: +- [Let's Do] Beachparty `1.1.5` compat +- [Let's Do] Vinery `1.4.28` compat \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1c6fc04..f88e18c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.parallel=true loader_version=0.14.24 # Mod Properties - mod_version=1.0.9 + mod_version=1.0.10 maven_group=net.nutritionz archives_base_name=nutritionz diff --git a/src/main/java/net/nutritionz/init/EventInit.java b/src/main/java/net/nutritionz/init/EventInit.java index 0228750..075c974 100644 --- a/src/main/java/net/nutritionz/init/EventInit.java +++ b/src/main/java/net/nutritionz/init/EventInit.java @@ -52,6 +52,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "candlelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); } + if (FabricLoader.getInstance().isModLoaded("cornexpansion")) { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "cornexpansion_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), + ResourcePackActivationType.DEFAULT_ENABLED); + } if (FabricLoader.getInstance().isModLoaded("dehydration") && FabricLoader.getInstance().isModLoaded("meadow")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_x_meadow_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); @@ -64,6 +68,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_x_vinery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); } + if (FabricLoader.getInstance().isModLoaded("farm_and_charm")) { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "farm_and_charm_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), + ResourcePackActivationType.DEFAULT_ENABLED); + } if (FabricLoader.getInstance().isModLoaded("herbalbrews")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "herbalbrews_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); @@ -80,6 +88,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "vinery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); } + if (FabricLoader.getInstance().isModLoaded("wildernature")) { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "wildernature_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), + ResourcePackActivationType.DEFAULT_ENABLED); + } // Farmers Delight Series if (FabricLoader.getInstance().isModLoaded("brewinandchewin")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "brewinandchewin_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), diff --git a/src/main/resources/data/nutritionz/nutrition_manager/default.json b/src/main/resources/data/nutritionz/nutrition_manager/default.json index 820e13c..1538080 100644 --- a/src/main/resources/data/nutritionz/nutrition_manager/default.json +++ b/src/main/resources/data/nutritionz/nutrition_manager/default.json @@ -110,7 +110,7 @@ "operation": "ADDITION", "value": 1.0 }, - "minecraft:mining_fatigue": { + "minecraft:nausea": { "duration": 319, "amplifier": 0 } diff --git a/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta index fdf16f6..746228e 100644 --- a/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Ad Astra nutritionz compat" + "text": "ad astra nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta index 22c9333..a9b0298 100644 --- a/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "adventurez nutritionz compat" } diff --git a/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta index dada140..61c6e6e 100644 --- a/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Aquamirae nutritionz compat" + "text": "aquamirae nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json b/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json index 02d036f..2fcf2d2 100644 --- a/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json +++ b/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json @@ -1,18 +1,4 @@ { - "bakery:bread": { - "carbohydrates": 19, - "protein": 4, - "fat": 1, - "vitamins": 0, - "minerals": 1 - }, - "bakery:bread_crate": { - "carbohydrates": 19, - "protein": 4, - "fat": 1, - "vitamins": 0, - "minerals": 1 - }, "bakery:strawberry_cake": { "carbohydrates": 10, "protein": 0, @@ -34,9 +20,9 @@ "vitamins": 0, "minerals": 0 }, - "bakery:pudding": { - "carbohydrates": 5, - "protein": 10, + "bakery:chocolate_gateau": { + "carbohydrates": 10, + "protein": 5, "fat": 10, "vitamins": 0, "minerals": 0 @@ -56,18 +42,18 @@ "minerals": 0 }, "bakery:apple_pie": { - "carbohydrates": 12, + "carbohydrates": 8, "protein": 3, "fat": 6, - "vitamins": 4, + "vitamins": 8, "minerals": 0 }, - "bakery:glowberry_tart": { - "carbohydrates": 12, + "bakery:glowberry_pie": { + "carbohydrates": 8, "protein": 2, "fat": 5, - "vitamins": 3, - "minerals": 3 + "vitamins": 5, + "minerals": 5 }, "bakery:chocolate_tart": { "carbohydrates": 10, @@ -76,9 +62,9 @@ "vitamins": 0, "minerals": 0 }, - "bakery:chocolate_gateau": { - "carbohydrates": 10, - "protein": 5, + "bakery:pudding": { + "carbohydrates": 5, + "protein": 10, "fat": 10, "vitamins": 0, "minerals": 0 diff --git a/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json b/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json index 3650202..11bf5b4 100644 --- a/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json +++ b/src/main/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json @@ -1,17 +1,17 @@ { - "bakery:strawberry": { - "carbohydrates": 1, - "protein": 0, - "fat": 0, - "vitamins": 3, - "minerals": 1 - }, - "bakery:oat": { + "bakery:cake_dough": { "carbohydrates": 3, + "protein": 2, + "fat": 3, + "vitamins": 0, + "minerals": 2 + }, + "bakery:sweet_dough": { + "carbohydrates": 4, "protein": 1, - "fat": 0, + "fat": 3, "vitamins": 0, - "minerals": 1 + "minerals": 2 }, "bakery:croissant": { "carbohydrates": 8, @@ -62,20 +62,6 @@ "vitamins": 0, "minerals": 1 }, - "bakery:vegetable_sandwich": { - "carbohydrates": 10, - "protein": 5, - "fat": 0, - "vitamins": 5, - "minerals": 5 - }, - "bakery:sandwich": { - "carbohydrates": 10, - "protein": 10, - "fat": 5, - "vitamins": 0, - "minerals": 0 - }, "bakery:strawberry_cake_slice": { "carbohydrates": 10, "protein": 0, @@ -119,18 +105,18 @@ "minerals": 0 }, "bakery:apple_pie_slice": { - "carbohydrates": 12, + "carbohydrates": 8, "protein": 3, "fat": 6, - "vitamins": 4, + "vitamins": 8, "minerals": 0 }, "bakery:glowberry_pie_slice": { - "carbohydrates": 12, + "carbohydrates": 8, "protein": 2, "fat": 5, - "vitamins": 3, - "minerals": 3 + "vitamins": 5, + "minerals": 5 }, "bakery:chocolate_tart_slice": { "carbohydrates": 10, @@ -222,5 +208,40 @@ "fat": 5, "vitamins": 0, "minerals": 0 + }, + "bakery:sandwich": { + "carbohydrates": 10, + "protein": 10, + "fat": 5, + "vitamins": 5, + "minerals": 5 + }, + "bakery:vegetable_sandwich": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 25, + "minerals": 5 + }, + "bakery:grilled_salmon_sandwich": { + "carbohydrates": 10, + "protein": 8, + "fat": 2, + "vitamins": 5, + "minerals": 5 + }, + "bakery:grilled_bacon_sandwich": { + "carbohydrates": 10, + "protein": 15, + "fat": 10, + "vitamins": 0, + "minerals": 0 + }, + "bakery:bread_with_jam": { + "carbohydrates": 15, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta index 8098fdb..b625366 100644 --- a/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "bakery nutritionz compat" + "text": "bakery farm & charm compat nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/beachparty_nutrition_compat/data/beachparty/nutrition/beachparty_items.json b/src/main/resources/resourcepacks/beachparty_nutrition_compat/data/beachparty/nutrition/beachparty_items.json index 8a67b55..e1c2a7b 100644 --- a/src/main/resources/resourcepacks/beachparty_nutrition_compat/data/beachparty/nutrition/beachparty_items.json +++ b/src/main/resources/resourcepacks/beachparty_nutrition_compat/data/beachparty/nutrition/beachparty_items.json @@ -49,87 +49,87 @@ "minerals": 1 }, "beachparty:sweetberry_milkshake": { - "carbohydrates": 4, + "carbohydrates": 0, "protein": 2, - "fat": 10, - "vitamins": 8, - "minerals": 1 + "fat": 8, + "vitamins": 3, + "minerals": 2 }, "beachparty:coconut_milkshake": { - "carbohydrates": 1, + "carbohydrates": 0, "protein": 2, - "fat": 20, + "fat": 13, "vitamins": 0, - "minerals": 2 + "minerals": 0 }, "beachparty:chocolate_milkshake": { "carbohydrates": 5, "protein": 5, - "fat": 10, + "fat": 5, "vitamins": 0, - "minerals": 5 + "minerals": 0 }, "beachparty:refreshing_drink": { - "carbohydrates": 5, + "carbohydrates": 0, "protein": 0, "fat": 0, - "vitamins": 15, + "vitamins": 10, "minerals": 5 }, "beachparty:sweetberry_icecream": { - "carbohydrates": 10, + "carbohydrates": 4, "protein": 0, "fat": 0, - "vitamins": 25, - "minerals": 5 + "vitamins": 4, + "minerals": 2 }, "beachparty:coconut_icecream": { - "carbohydrates": 5, - "protein": 5, - "fat": 25, + "carbohydrates": 0, + "protein": 2, + "fat": 8, "vitamins": 0, - "minerals": 5 + "minerals": 0 }, "beachparty:chocolate_icecream": { - "carbohydrates": 25, - "protein": 0, - "fat": 0, + "carbohydrates": 3, + "protein": 2, + "fat": 5, "vitamins": 0, - "minerals": 15 + "minerals": 0 }, "beachparty:icecream_coconut": { - "carbohydrates": 2, + "carbohydrates": 0, "protein": 3, - "fat": 17, + "fat": 10, "vitamins": 0, - "minerals": 3 + "minerals": 2 }, "beachparty:icecream_cactus": { - "carbohydrates": 10, + "carbohydrates": 5, "protein": 0, "fat": 0, "vitamins": 5, - "minerals": 10 + "minerals": 5 }, "beachparty:icecream_chocolate": { - "carbohydrates": 15, + "carbohydrates": 10, "protein": 0, "fat": 0, "vitamins": 0, - "minerals": 10 + "minerals": 5 }, "beachparty:icecream_sweetberries": { - "carbohydrates": 8, + "carbohydrates": 5, "protein": 0, "fat": 0, - "vitamins": 12, + "vitamins": 5, "minerals": 5 }, "beachparty:icecream_melon": { - "carbohydrates": 10, + "carbohydrates": 5, "protein": 0, "fat": 0, - "vitamins": 10, + "vitamins": 5, "minerals": 5 }, "beachparty:raw_mussel_meat": { diff --git a/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.mcmeta index d3e3926..cecd404 100644 --- a/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "beachparty nutritionz compat" } diff --git a/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.mcmeta index 8a49919..f3bce8d 100644 --- a/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "betterend nutritionz compat" } diff --git a/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.mcmeta index fe864b9..52b1847 100644 --- a/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "betternether nutritionz compat" } diff --git a/src/main/resources/resourcepacks/biomemakeover_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/biomemakeover_nutrition_compat/pack.mcmeta index c35f40e..ab69e57 100644 --- a/src/main/resources/resourcepacks/biomemakeover_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/biomemakeover_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Biome Makeover nutritionz compat" + "text": "biome makeover nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/bountifulfares_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/bountifulfares_nutrition_compat/pack.mcmeta index 1730fc6..303fcad 100644 --- a/src/main/resources/resourcepacks/bountifulfares_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/bountifulfares_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Bountiful Fares nutritionz compat" + "text": "bountiful fares nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/brewery_nutrition_compat/data/brewery/nutrition/brewery_items.json b/src/main/resources/resourcepacks/brewery_nutrition_compat/data/brewery/nutrition/brewery_items.json index 5e7d510..41cd1af 100644 --- a/src/main/resources/resourcepacks/brewery_nutrition_compat/data/brewery/nutrition/brewery_items.json +++ b/src/main/resources/resourcepacks/brewery_nutrition_compat/data/brewery/nutrition/brewery_items.json @@ -6,20 +6,6 @@ "vitamins": 8, "minerals": 8 }, - "brewery:barley": { - "carbohydrates": 10, - "protein": 0, - "fat": 0, - "vitamins": 5, - "minerals": 5 - }, - "brewery:corn": { - "carbohydrates": 10, - "protein": 0, - "fat": 0, - "vitamins": 5, - "minerals": 5 - }, "brewery:beer_wheat": { "carbohydrates": 3, "protein": 0, @@ -41,6 +27,20 @@ "vitamins": 4, "minerals": 4 }, + "brewery:beer_nettle": { + "carbohydrates": 3, + "protein": 0, + "fat": 0, + "vitamins": 4, + "minerals": 3 + }, + "brewery:beer_oat": { + "carbohydrates": 4, + "protein": 0, + "fat": 0, + "vitamins": 2, + "minerals": 4 + }, "brewery:beer_haley": { "carbohydrates": 0, "protein": 0, @@ -83,6 +83,34 @@ "vitamins": 0, "minerals": 10 }, + "brewery:whiskey_ak": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "brewery:whiskey_highland_hearth": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "brewery:whiskey_smokey_reverie": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "brewery:whiskey_jamesons_malt": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, "brewery:pork_knuckle": { "carbohydrates": 5, "protein": 15, @@ -97,6 +125,13 @@ "vitamins": 0, "minerals": 5 }, + "brewery:dumplings": { + "carbohydrates": 15, + "protein": 5, + "fat": 0, + "vitamins": 10, + "minerals": 5 + }, "brewery:half_chicken": { "carbohydrates": 10, "protein": 20, @@ -112,21 +147,14 @@ "minerals": 5 }, "brewery:mashed_potatoes": { - "carbohydrates": 25, + "carbohydrates": 10, "protein": 5, "fat": 0, "vitamins": 0, - "minerals": 10 - }, - "brewery:potato_salad": { - "carbohydrates": 15, - "protein": 5, - "fat": 0, - "vitamins": 10, "minerals": 5 }, - "brewery:dumplings": { - "carbohydrates": 15, + "brewery:potato_salad": { + "carbohydrates": 20, "protein": 5, "fat": 0, "vitamins": 10, diff --git a/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.mcmeta index abd70b1..29eebbb 100644 --- a/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "brewery nutritionz compat" + "text": "brewery farm & charm compat nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta index 08ccefd..53710c4 100644 --- a/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Brewin and Chewin compat for Nutritionz" + "text": "brewin and chewin nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/candlelight_nutrition_compat/data/candlelight/nutrition/candlelight_items.json b/src/main/resources/resourcepacks/candlelight_nutrition_compat/data/candlelight/nutrition/candlelight_items.json index 5b9bd8e..0f0b9fd 100644 --- a/src/main/resources/resourcepacks/candlelight_nutrition_compat/data/candlelight/nutrition/candlelight_items.json +++ b/src/main/resources/resourcepacks/candlelight_nutrition_compat/data/candlelight/nutrition/candlelight_items.json @@ -1,25 +1,4 @@ { - "candlelight:tomato": { - "carbohydrates": 4, - "protein": 0, - "fat": 0, - "vitamins": 12, - "minerals": 4 - }, - "candlelight:lettuce": { - "carbohydrates": 0, - "protein": 0, - "fat": 0, - "vitamins": 12, - "minerals": 3 - }, - "candlelight:mozzarella": { - "carbohydrates": 0, - "protein": 5, - "fat": 20, - "vitamins": 0, - "minerals": 0 - }, "candlelight:tomato_soup": { "carbohydrates": 10, "protein": 0, @@ -41,12 +20,12 @@ "vitamins": 3, "minerals": 1 }, - "candlelight:pasta": { - "carbohydrates": 23, - "protein": 9, - "fat": 13, - "vitamins": 4, - "minerals": 1 + "candlelight:pasta_with_mozzarella": { + "carbohydrates": 20, + "protein": 5, + "fat": 20, + "vitamins": 0, + "minerals": 5 }, "candlelight:bolognese": { "carbohydrates": 5, @@ -62,144 +41,158 @@ "vitamins": 15, "minerals": 2 }, - "candlelight:lettuce_salad": { - "carbohydrates": 4, + "candlelight:salad": { + "carbohydrates": 0, "protein": 4, - "fat": 4, - "vitamins": 10, - "minerals": 3 + "fat": 8, + "vitamins": 8, + "minerals": 5 }, - "candlelight:beef_tartare": { - "carbohydrates": 0, - "protein": 24, - "fat": 16, + "candlelight:chocolate_mousse": { + "carbohydrates": 5, + "protein": 5, + "fat": 8, "vitamins": 0, - "minerals": 0 + "minerals": 2 }, - "candlelight:cooked_beef": { + "candlelight:mozzarella": { "carbohydrates": 0, - "protein": 24, - "fat": 16, + "protein": 5, + "fat": 20, "vitamins": 0, "minerals": 0 }, - "candlelight:chicken_alfredo": { - "carbohydrates": 14, - "protein": 18, - "fat": 3, + "candlelight:beef_tartare": { + "carbohydrates": 5, + "protein": 20, + "fat": 10, "vitamins": 0, - "minerals": 0 + "minerals": 5 }, - "candlelight:lettuce_beef": { - "carbohydrates": 0, - "protein": 18, - "fat": 12, - "vitamins": 10, + "candlelight:pasta_with_bolognese": { + "carbohydrates": 10, + "protein": 10, + "fat": 10, + "vitamins": 5, "minerals": 0 }, - "candlelight:lettuce_tomato": { - "carbohydrates": 16, - "protein": 0, + "candlelight:pasta_with_lettuce": { + "carbohydrates": 15, + "protein": 5, "fat": 0, - "vitamins": 20, - "minerals": 4 + "vitamins": 15, + "minerals": 5 }, - "candlelight:salmon_wine": { - "carbohydrates": 0, + "candlelight:omelet": { + "carbohydrates": 5, "protein": 10, "fat": 10, - "vitamins": 0, + "vitamins": 5, + "minerals": 10 + }, + "candlelight:fresh_garden_salad": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 20, "minerals": 5 }, - "candlelight:veggie_plate": { - "carbohydrates": 14, + "candlelight:harvest_plate": { + "carbohydrates": 5, "protein": 0, "fat": 0, - "vitamins": 16, + "vitamins": 15, "minerals": 5 }, - "candlelight:pork_ribs": { - "carbohydrates": 12, - "protein": 12, + "candlelight:beef_with_mushroom_in_wine_and_potatoes": { + "carbohydrates": 5, + "protein": 20, "fat": 10, - "vitamins": 0, - "minerals": 1 - }, - "candlelight:pasta_bolognese": { - "carbohydrates": 10, - "protein": 10, - "fat": 8, "vitamins": 5, - "minerals": 2 + "minerals": 10 }, - "candlelight:pasta_lettuce": { - "carbohydrates": 10, + "candlelight:tomato_mozzarella_salad": { + "carbohydrates": 0, "protein": 0, - "fat": 10, + "fat": 15, "vitamins": 10, "minerals": 0 }, - "candlelight:pancake": { - "carbohydrates": 15, - "protein": 10, - "fat": 25, + "candlelight:pork_ribs": { + "carbohydrates": 5, + "protein": 20, + "fat": 10, "vitamins": 0, "minerals": 0 }, - "candlelight:fricasse": { - "carbohydrates": 15, - "protein": 20, - "fat": 15, + "candlelight:khinkali": { + "carbohydrates": 10, + "protein": 15, + "fat": 5, "vitamins": 0, "minerals": 0 }, - "candlelight:chicken": { - "carbohydrates": 0, - "protein": 13, - "fat": 4, - "vitamins": 13, - "minerals": 0 + "candlelight:roastbeef_with_glazed_carrots": { + "carbohydrates": 5, + "protein": 15, + "fat": 5, + "vitamins": 15, + "minerals": 10 }, - "candlelight:tomato_mozzarella_salad": { + "candlelight:roasted_lamb_with_lettuce": { "carbohydrates": 0, - "protein": 2, - "fat": 18, + "protein": 15, + "fat": 10, "vitamins": 10, - "minerals": 0 + "minerals": 5 }, - "candlelight:lasagne": { - "carbohydrates": 10, + "candlelight:tropical_fish_supreme": { + "carbohydrates": 0, "protein": 10, - "fat": 20, + "fat": 5, "vitamins": 10, - "minerals": 0 + "minerals": 5 }, - "candlelight:roastbeef_carrots": { - "carbohydrates": 10, - "protein": 14, - "fat": 8, - "vitamins": 6, - "minerals": 2 + "candlelight:fillet_steak": { + "carbohydrates": 0, + "protein": 20, + "fat": 10, + "vitamins": 0, + "minerals": 10 }, - "candlelight:beef_wellington": { - "carbohydrates": 10, + "candlelight:salmon_on_white_wine": { + "carbohydrates": 0, "protein": 15, "fat": 10, - "vitamins": 15, + "vitamins": 0, "minerals": 0 }, - "candlelight:chocolate": { - "carbohydrates": 8, - "protein": 2, - "fat": 10, + "candlelight:chicken_alfredo": { + "carbohydrates": 15, + "protein": 15, + "fat": 5, "vitamins": 0, - "minerals": 0 + "minerals": 5 }, - "candlelight:tropical_fish_supreme": { - "carbohydrates": 5, + "candlelight:chicken_with_vegetables": { + "carbohydrates": 0, "protein": 10, "fat": 5, - "vitamins": 5, + "vitamins": 10, "minerals": 5 + }, + "candlelight:lasagne": { + "carbohydrates": 15, + "protein": 10, + "fat": 10, + "vitamins": 5, + "minerals": 10 + }, + "candlelight:beef_wellington": { + "carbohydrates": 10, + "protein": 10, + "fat": 10, + "vitamins": 10, + "minerals": 10 } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.mcmeta index 73794a7..819454d 100644 --- a/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "candlelight nutritionz compat" + "text": "candlelight farm & charm compat nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/data/cornexpansion/nutrition/cornexpansion_items.json b/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/data/cornexpansion/nutrition/cornexpansion_items.json new file mode 100644 index 0000000..4a9c63b --- /dev/null +++ b/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/data/cornexpansion/nutrition/cornexpansion_items.json @@ -0,0 +1,93 @@ +{ + "cornexpansion:corn_dough": { + "carbohydrates": 3, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 2 + }, + "cornexpansion:corn_syrup": { + "carbohydrates": 15, + "protein": 5, + "fat": 0, + "vitamins": 5, + "minerals": 10 + }, + "cornexpansion:buttery_popcorn": { + "carbohydrates": 2, + "protein": 3, + "fat": 0, + "vitamins": 0, + "minerals": 0 + }, + "cornexpansion:cheesy_popcorn": { + "carbohydrates": 3, + "protein": 8, + "fat": 2, + "vitamins": 0, + "minerals": 2 + }, + "cornexpansion:candied_popcorn": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 0 + }, + "cornexpansion:corn_on_the_cob": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 3, + "minerals": 2 + }, + "cornexpansion:grilled_corn": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "cornexpansion:grandmas_cornbread": { + "carbohydrates": 15, + "protein": 0, + "fat": 0, + "vitamins": 5, + "minerals": 10 + }, + "cornexpansion:corn_syrup_cookie": { + "carbohydrates": 5, + "protein": 5, + "fat": 0, + "vitamins": 0, + "minerals": 5 + }, + "cornexpansion:polenta": { + "carbohydrates": 5, + "protein": 5, + "fat": 0, + "vitamins": 0, + "minerals": 5 + }, + "cornexpansion:sweet_polenta": { + "carbohydrates": 10, + "protein": 5, + "fat": 0, + "vitamins": 0, + "minerals": 0 + }, + "cornexpansion:buttery_polenta": { + "carbohydrates": 5, + "protein": 8, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "cornexpansion:cheesy_polenta": { + "carbohydrates": 5, + "protein": 10, + "fat": 0, + "vitamins": 0, + "minerals": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..ba81107 --- /dev/null +++ b/src/main/resources/resourcepacks/cornexpansion_nutrition_compat/pack.mcmeta @@ -0,0 +1,12 @@ +{ + "pack": { + "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, + "description": { + "text": "cornexpansion nutritionz compat" + } + } +} diff --git a/src/main/resources/resourcepacks/create_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/create_nutrition_compat/pack.mcmeta index 283e3c3..bc0fe17 100644 --- a/src/main/resources/resourcepacks/create_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/create_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Create nutritionz compat" + "text": "create nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/createaddition_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/createaddition_nutrition_compat/pack.mcmeta index cbc9f2e..82e71db 100644 --- a/src/main/resources/resourcepacks/createaddition_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/createaddition_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Create Crafts & Additions compat for Nutritionz" + "text": "create crafts & additions nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/culinaire_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/culinaire_nutrition_compat/pack.mcmeta index cfd62cb..6ba9ab5 100644 --- a/src/main/resources/resourcepacks/culinaire_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/culinaire_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Culinaire NutritionZ compat" + "text": "culinaire nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/culturaldelights_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/culturaldelights_nutrition_compat/pack.mcmeta index 68951ce..dbb19a4 100644 --- a/src/main/resources/resourcepacks/culturaldelights_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/culturaldelights_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Cultural Delight compat for Nutritionz" + "text": "cultural delight compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/dehydration_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/dehydration_nutrition_compat/pack.mcmeta index 267d4c5..3544b92 100644 --- a/src/main/resources/resourcepacks/dehydration_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/dehydration_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "dehydration nutritionz compat" } diff --git a/src/main/resources/resourcepacks/dehydration_x_meadow_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/dehydration_x_meadow_nutrition_compat/pack.mcmeta index f8cafc6..5f50386 100644 --- a/src/main/resources/resourcepacks/dehydration_x_meadow_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/dehydration_x_meadow_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "dehydration and meadow nutritionz compat" } diff --git a/src/main/resources/resourcepacks/dehydration_x_nethervinery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/dehydration_x_nethervinery_nutrition_compat/pack.mcmeta index bd6ae8c..d1fc303 100644 --- a/src/main/resources/resourcepacks/dehydration_x_nethervinery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/dehydration_x_nethervinery_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "dehydration x nethervinery nutritionz compat" } diff --git a/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/data/vinery/nutrition/dehydration_x_vinery_items.json b/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/data/vinery/nutrition/dehydration_x_vinery_items.json index 75e322e..c368a1e 100644 --- a/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/data/vinery/nutrition/dehydration_x_vinery_items.json +++ b/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/data/vinery/nutrition/dehydration_x_vinery_items.json @@ -194,5 +194,12 @@ "fat": 0, "vitamins": 0, "minerals": 30 + }, + "vinery:count_roleester_shiraz": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 30 } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/pack.mcmeta index aeefc0d..65b0c58 100644 --- a/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/dehydration_x_vinery_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "dehydration x vinery nutritionz compat" } diff --git a/src/main/resources/resourcepacks/endsdelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/endsdelight_nutrition_compat/pack.mcmeta index 60b00ba..4309f1c 100644 --- a/src/main/resources/resourcepacks/endsdelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/endsdelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "End's Delight compat for Nutritionz" + "text": "end's delight compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/exlinefishing_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/exlinefishing_nutrition_compat/pack.mcmeta index f68bdd4..89a5ac3 100644 --- a/src/main/resources/resourcepacks/exlinefishing_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/exlinefishing_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Exline's Fishing Nutritionz compat" + "text": "rxline's fishing Nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/expandeddelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/expandeddelight_nutrition_compat/pack.mcmeta index 268978b..3259ea3 100644 --- a/src/main/resources/resourcepacks/expandeddelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/expandeddelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Expanded Delight compat for Nutritionz" + "text": "expanded delight compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/data/farm_and_charm/nutrition/farm_and_charm_items.json b/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/data/farm_and_charm/nutrition/farm_and_charm_items.json new file mode 100644 index 0000000..203aba4 --- /dev/null +++ b/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/data/farm_and_charm/nutrition/farm_and_charm_items.json @@ -0,0 +1,324 @@ +{ + "farm_and_charm:corn": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 3, + "minerals": 2 + }, + "farm_and_charm:lettuce": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:onion": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 7, + "minerals": 3 + }, + "farm_and_charm:tomato": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 15, + "minerals": 5 + }, + "farm_and_charm:rotten_tomato": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "farm_and_charm:strawberry": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 5, + "minerals": 0 + }, + "farm_and_charm:butter": { + "carbohydrates": 0, + "protein": 5, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:dough": { + "carbohydrates": 8, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 2 + }, + "farm_and_charm:raw_pasta": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:minced_beef": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:lamb_ham": { + "carbohydrates": 0, + "protein": 4, + "fat": 6, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:chicken_parts": { + "carbohydrates": 0, + "protein": 5, + "fat": 1, + "vitamins": 0, + "minerals": 4 + }, + "farm_and_charm:bacon": { + "carbohydrates": 0, + "protein": 5, + "fat": 10, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:farmer_salad": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 25, + "minerals": 10 + }, + "farm_and_charm:oatmeal_with_strawberries": { + "carbohydrates": 4, + "protein": 4, + "fat": 4, + "vitamins": 4, + "minerals": 4 + }, + "farm_and_charm:simple_tomato_soup": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 20, + "minerals": 5 + }, + "farm_and_charm:barley_soup": { + "carbohydrates": 10, + "protein": 5, + "fat": 0, + "vitamins": 0, + "minerals": 10 + }, + "farm_and_charm:onion_soup": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 15, + "minerals": 10 + }, + "farm_and_charm:potato_soup": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 10, + "minerals": 10 + }, + "farm_and_charm:goulash": { + "carbohydrates": 10, + "protein": 10, + "fat": 5, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:pasta_with_onion_sauce": { + "carbohydrates": 10, + "protein": 0, + "fat": 0, + "vitamins": 15, + "minerals": 5 + }, + "farm_and_charm:corn_grits": { + "carbohydrates": 15, + "protein": 0, + "fat": 0, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:barley_patties_with_potatoes": { + "carbohydrates": 10, + "protein": 5, + "fat": 0, + "vitamins": 5, + "minerals": 5 + }, + "farm_and_charm:beef_patty_with_vegetables": { + "carbohydrates": 5, + "protein": 5, + "fat": 0, + "vitamins": 15, + "minerals": 5 + }, + "farm_and_charm:sausage_with_oat_patty": { + "carbohydrates": 10, + "protein": 15, + "fat": 5, + "vitamins": 5, + "minerals": 5 + }, + "farm_and_charm:roasted_chicken": { + "carbohydrates": 10, + "protein": 10, + "fat": 0, + "vitamins": 5, + "minerals": 0 + }, + "farm_and_charm:roasted_corn": { + "carbohydrates": 10, + "protein": 5, + "fat": 0, + "vitamins": 5, + "minerals": 5 + }, + "farm_and_charm:cooked_salmon": { + "carbohydrates": 10, + "protein": 10, + "fat": 0, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:cooked_cod": { + "carbohydrates": 10, + "protein": 10, + "fat": 0, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:chicken_wrapped_in_bacon": { + "carbohydrates": 10, + "protein": 15, + "fat": 15, + "vitamins": 0, + "minerals": 5 + }, + "farm_and_charm:lamb_with_corn": { + "carbohydrates": 10, + "protein": 5, + "fat": 10, + "vitamins": 10, + "minerals": 5 + }, + "farm_and_charm:bacon_with_eggs": { + "carbohydrates": 0, + "protein": 15, + "fat": 15, + "vitamins": 0, + "minerals": 0 + }, + "farm_and_charm:oat_pancake": { + "carbohydrates": 10, + "protein": 10, + "fat": 0, + "vitamins": 5, + "minerals": 0 + }, + "farm_and_charm:farmers_breakfast": { + "carbohydrates": 20, + "protein": 20, + "fat": 10, + "vitamins": 0, + "minerals": 10 + }, + "farm_and_charm:baked_lamb_ham": { + "carbohydrates": 0, + "protein": 10, + "fat": 10, + "vitamins": 10, + "minerals": 10 + }, + "farm_and_charm:potato_with_roast_meat": { + "carbohydrates": 10, + "protein": 10, + "fat": 5, + "vitamins": 5, + "minerals": 5 + }, + "farm_and_charm:stuffed_chicken": { + "carbohydrates": 5, + "protein": 10, + "fat": 5, + "vitamins": 15, + "minerals": 5 + }, + "farm_and_charm:stuffed_rabbit": { + "carbohydrates": 5, + "protein": 15, + "fat": 5, + "vitamins": 15, + "minerals": 5 + }, + "farm_and_charm:farmers_bread": { + "carbohydrates": 20, + "protein": 5, + "fat": 0, + "vitamins": 0, + "minerals": 5 + }, + "farm_and_charm:grandmothers_strawberry_cake": { + "carbohydrates": 5, + "protein": 0, + "fat": 0, + "vitamins": 5, + "minerals": 10 + }, + "farm_and_charm:strawberry_tea": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 3, + "minerals": 2 + }, + "farm_and_charm:nettle_tea": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 4, + "minerals": 1 + }, + "farm_and_charm:ribwort_tea": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 2, + "minerals": 3 + }, + "farm_and_charm:strawberry_tea_cup": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 3, + "minerals": 2 + }, + "farm_and_charm:nettle_tea_cup": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 4, + "minerals": 1 + }, + "farm_and_charm:ribwort_tea_cup": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 2, + "minerals": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..a534691 --- /dev/null +++ b/src/main/resources/resourcepacks/farm_and_charm_nutrition_compat/pack.mcmeta @@ -0,0 +1,12 @@ +{ + "pack": { + "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, + "description": { + "text": "farm & charm nutritionz compat" + } + } +} diff --git a/src/main/resources/resourcepacks/farmersdelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/farmersdelight_nutrition_compat/pack.mcmeta index b5daa7a..e0e20b5 100644 --- a/src/main/resources/resourcepacks/farmersdelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/farmersdelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Farmer's Delight Refabricated compat for Nutritionz" + "text": "farmer's delight Refabricated compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/festivedelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/festivedelight_nutrition_compat/pack.mcmeta index d9be454..6742190 100644 --- a/src/main/resources/resourcepacks/festivedelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/festivedelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Festive Delight compat for Nutritionz" + "text": "festive delight compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/fishofthieves_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/fishofthieves_nutrition_compat/pack.mcmeta index 01b8c18..8590b20 100644 --- a/src/main/resources/resourcepacks/fishofthieves_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/fishofthieves_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Fish of Thieves nutritionz compat" + "text": "fish of thieves nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/herbalbrews_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/herbalbrews_nutrition_compat/pack.mcmeta index f7ebe49..a8e16ad 100644 --- a/src/main/resources/resourcepacks/herbalbrews_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/herbalbrews_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "herbalbrews nutritionz compat" } diff --git a/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta index 7b09728..2a28430 100644 --- a/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "hybrid-aquatic nutritionz compat" } diff --git a/src/main/resources/resourcepacks/immersiveweathering_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/immersiveweathering_nutrition_compat/pack.mcmeta index 048ae07..a03510e 100644 --- a/src/main/resources/resourcepacks/immersiveweathering_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/immersiveweathering_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Immersive Weathering nutritionz compat" + "text": "immersive weathering nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/livingthings_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/livingthings_nutrition_compat/pack.mcmeta index 3e52714..2f5a336 100644 --- a/src/main/resources/resourcepacks/livingthings_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/livingthings_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Living Things nutritionz compat" + "text": "living things nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/meadow_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/meadow_nutrition_compat/pack.mcmeta index 18c1b1e..69d12b9 100644 --- a/src/main/resources/resourcepacks/meadow_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/meadow_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "meadow nutritionz compat" } diff --git a/src/main/resources/resourcepacks/mobcatalog_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/mobcatalog_nutrition_compat/pack.mcmeta index 55547f8..5adcd54 100644 --- a/src/main/resources/resourcepacks/mobcatalog_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/mobcatalog_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "mobcatalog nutritionz compat" } diff --git a/src/main/resources/resourcepacks/moredelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/moredelight_nutrition_compat/pack.mcmeta index ecc2ea8..aa2cb89 100644 --- a/src/main/resources/resourcepacks/moredelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/moredelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "More Delight nutritionz compat" + "text": "more delight nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/naturalist_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/naturalist_nutrition_compat/pack.mcmeta index 5d15c89..8175277 100644 --- a/src/main/resources/resourcepacks/naturalist_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/naturalist_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "naturalist nutritionz compat" } diff --git a/src/main/resources/resourcepacks/natures_delight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/natures_delight_nutrition_compat/pack.mcmeta index cbf2433..13112c8 100644 --- a/src/main/resources/resourcepacks/natures_delight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/natures_delight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Natures Delight nutritionz compat" + "text": "natures delight nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta index b061969..f520da7 100644 --- a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "natures spirit nutritionz compat" } diff --git a/src/main/resources/resourcepacks/nethersdelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/nethersdelight_nutrition_compat/pack.mcmeta index 16c4183..d2f381d 100644 --- a/src/main/resources/resourcepacks/nethersdelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/nethersdelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Nether's Delight compat for Nutritionz" + "text": "nether's delight compat for Nutritionz" } } } diff --git a/src/main/resources/resourcepacks/nethervinery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/nethervinery_nutrition_compat/pack.mcmeta index df583fc..bd69042 100644 --- a/src/main/resources/resourcepacks/nethervinery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/nethervinery_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "nethervinery nutritionz compat" } diff --git a/src/main/resources/resourcepacks/oceansdelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/oceansdelight_nutrition_compat/pack.mcmeta index 82fd774..bd42b1d 100644 --- a/src/main/resources/resourcepacks/oceansdelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/oceansdelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Ocean's Delight nutritionz compat" + "text": "ocean's delight nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/promenade_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/promenade_nutrition_compat/pack.mcmeta index a0879a2..0e685af 100644 --- a/src/main/resources/resourcepacks/promenade_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/promenade_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Promenade nutritionz compat" + "text": "promenade nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta index 5d81c2c..bdd4d0e 100644 --- a/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "regions_unexplored nutritionz compat" } diff --git a/src/main/resources/resourcepacks/spawn_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/spawn_nutrition_compat/pack.mcmeta index 4abfd6f..fc8f02e 100644 --- a/src/main/resources/resourcepacks/spawn_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/spawn_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Spawn nutritionz compat" + "text": "spawn nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/spelunkery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/spelunkery_nutrition_compat/pack.mcmeta index edc9a21..85cbc4f 100644 --- a/src/main/resources/resourcepacks/spelunkery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/spelunkery_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Spelunkery nutritionz compat" + "text": "spelunkery nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/supplementaries_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/supplementaries_nutrition_compat/pack.mcmeta index a312fc5..06d61d0 100644 --- a/src/main/resources/resourcepacks/supplementaries_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/supplementaries_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "supplementaries nutritionz compat" } diff --git a/src/main/resources/resourcepacks/thebumblezone_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/thebumblezone_nutrition_compat/pack.mcmeta index 9201ee8..dfdf7bd 100644 --- a/src/main/resources/resourcepacks/thebumblezone_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/thebumblezone_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "The Bumblezone nutritionz compat" + "text": "the bumblezone nutritionz compat" } } } diff --git a/src/main/resources/resourcepacks/ubesdelight_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/ubesdelight_nutrition_compat/pack.mcmeta index fbbb891..a10da50 100644 --- a/src/main/resources/resourcepacks/ubesdelight_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/ubesdelight_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Ube's Delight nutritionz compat" + "text": "ube's delight nutritionz compat" } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/vinery_nutrition_compat/data/vinery/nutrition/vinery_items.json b/src/main/resources/resourcepacks/vinery_nutrition_compat/data/vinery/nutrition/vinery_items.json index 474616e..f252cf5 100644 --- a/src/main/resources/resourcepacks/vinery_nutrition_compat/data/vinery/nutrition/vinery_items.json +++ b/src/main/resources/resourcepacks/vinery_nutrition_compat/data/vinery/nutrition/vinery_items.json @@ -7,11 +7,11 @@ "minerals": 0 }, "vinery:rotten_cherry": { - "carbohydrates": 7, - "protein": 1, + "carbohydrates": 0, + "protein": 0, "fat": 0, - "vitamins": 2, - "minerals": 0 + "vitamins": 0, + "minerals": 10 }, "vinery:red_grape": { "carbohydrates": 2, diff --git a/src/main/resources/resourcepacks/vinery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/vinery_nutrition_compat/pack.mcmeta index 829c867..db13b33 100644 --- a/src/main/resources/resourcepacks/vinery_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/vinery_nutrition_compat/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { "text": "vinery nutritionz compat" } diff --git a/src/main/resources/resourcepacks/wildernature_nutrition_compat/data/wildernature/nutrition/wildernature_items.json b/src/main/resources/resourcepacks/wildernature_nutrition_compat/data/wildernature/nutrition/wildernature_items.json new file mode 100644 index 0000000..b484761 --- /dev/null +++ b/src/main/resources/resourcepacks/wildernature_nutrition_compat/data/wildernature/nutrition/wildernature_items.json @@ -0,0 +1,79 @@ +{ + "wildernature:hazelnut": { + "carbohydrates": 2, + "protein": 3, + "fat": 10, + "vitamins": 0, + "minerals": 5 + }, + "wildernature:bison_meat": { + "carbohydrates": 0, + "protein": 5, + "fat": 10, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:cooked_bison_meat": { + "carbohydrates": 0, + "protein": 15, + "fat": 25, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:venison": { + "carbohydrates": 0, + "protein": 8, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:cooked_venison": { + "carbohydrates": 0, + "protein": 25, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:cassowary_meat": { + "carbohydrates": 0, + "protein": 5, + "fat": 5, + "vitamins": 0, + "minerals": 5 + }, + "wildernature:cooked_cassowary_meat": { + "carbohydrates": 0, + "protein": 10, + "fat": 10, + "vitamins": 0, + "minerals": 5 + }, + "wildernature:turkey_meat": { + "carbohydrates": 0, + "protein": 8, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:cooked_turkey_meat": { + "carbohydrates": 0, + "protein": 25, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:pelican_meat": { + "carbohydrates": 0, + "protein": 7, + "fat": 3, + "vitamins": 0, + "minerals": 0 + }, + "wildernature:cooked_pelican_meat": { + "carbohydrates": 0, + "protein": 20, + "fat": 10, + "vitamins": 0, + "minerals": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/wildernature_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/wildernature_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..95bb858 --- /dev/null +++ b/src/main/resources/resourcepacks/wildernature_nutrition_compat/pack.mcmeta @@ -0,0 +1,12 @@ +{ + "pack": { + "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, + "description": { + "text": "wildernature nutritionz compat" + } + } +} diff --git a/src/main/resources/resourcepacks/wilderwild_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/wilderwild_nutrition_compat/pack.mcmeta index c5a0ff8..752cbac 100644 --- a/src/main/resources/resourcepacks/wilderwild_nutrition_compat/pack.mcmeta +++ b/src/main/resources/resourcepacks/wilderwild_nutrition_compat/pack.mcmeta @@ -1,8 +1,12 @@ { "pack": { "pack_format": 15, + "supported_formats": { + "min_inclusive": 1, + "max_inclusive": 999 + }, "description": { - "text": "Wilder Wild nutritionz compat" + "text": "wilder wild nutritionz compat" } } } \ No newline at end of file