diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6b2ff..c1ad18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ ### Added: -- russian lang file `ru_ru.json` +- Nature's Spirit `1.4.5` compat +### Updated: +- [Let's Do] Meadow `1.3.14` compat +- [Let's Do] Vinery `1.4.19` compat diff --git a/gradle.properties b/gradle.properties index 381dfde..e2b4895 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.5 + mod_version=1.0.6 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 9bf2306..0b1389d 100644 --- a/src/main/java/net/nutritionz/init/EventInit.java +++ b/src/main/java/net/nutritionz/init/EventInit.java @@ -106,6 +106,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "naturalist_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); } + if (FabricLoader.getInstance().isModLoaded("natures_spirit")) { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "natures_spirit_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), + ResourcePackActivationType.DEFAULT_ENABLED); + } if (FabricLoader.getInstance().isModLoaded("nethervinery")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "nethervinery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); 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 a0b68a7..75e322e 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 @@ -187,5 +187,12 @@ "fat": 5, "vitamins": 5, "minerals": 20 + }, + "vinery:lamroc_wine": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 0, + "minerals": 30 } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/meadow_nutrition_compat/data/meadow/nutrition/meadow_items.json b/src/main/resources/resourcepacks/meadow_nutrition_compat/data/meadow/nutrition/meadow_items.json index d9a5714..62e79de 100644 --- a/src/main/resources/resourcepacks/meadow_nutrition_compat/data/meadow/nutrition/meadow_items.json +++ b/src/main/resources/resourcepacks/meadow_nutrition_compat/data/meadow/nutrition/meadow_items.json @@ -83,25 +83,25 @@ "vitamins": 0, "minerals": 5 }, - "meadow:raw_bear_meat": { + "meadow:raw_buffalo_meat": { "carbohydrates": 0, - "protein": 8, - "fat": 7, + "protein": 6, + "fat": 4, "vitamins": 0, "minerals": 0 }, - "meadow:cooked_bear_meat": { + "meadow:cooked_buffalo_meat": { "carbohydrates": 0, - "protein": 24, - "fat": 21, + "protein": 17, + "fat": 13, "vitamins": 0, "minerals": 0 }, - "meadow:ham_cheese": { - "carbohydrates": 0, + "meadow:sausage_with_cheese": { + "carbohydrates": 12, "protein": 11, "fat": 17, "vitamins": 0, - "minerals": 12 + "minerals": 0 } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_blocks.json b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_blocks.json new file mode 100644 index 0000000..ae2e5d7 --- /dev/null +++ b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_blocks.json @@ -0,0 +1,9 @@ +{ + "natures_spirit:pizza_block": { + "carbohydrates": 6, + "protein": 2, + "fat": 2, + "vitamins": 0, + "minerals": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_items.json b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_items.json new file mode 100644 index 0000000..4a8a21c --- /dev/null +++ b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/data/natures_spirit/nutrition/natures_spirit_items.json @@ -0,0 +1,51 @@ +{ + "natures_spirit:quarter_pizza": { + "carbohydrates": 6, + "protein": 2, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "natures_spirit:half_pizza": { + "carbohydrates": 6, + "protein": 2, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "natures_spirit:three_quarters_pizza": { + "carbohydrates": 6, + "protein": 2, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "natures_spirit:whole_pizza": { + "carbohydrates": 6, + "protein": 2, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "natures_spirit:green_olives": { + "carbohydrates": 0, + "protein": 0, + "fat": 7, + "vitamins": 2, + "minerals": 1 + }, + "natures_spirit:black_olives": { + "carbohydrates": 0, + "protein": 0, + "fat": 10, + "vitamins": 3, + "minerals": 2 + }, + "natures_spirit:desert_turnip": { + "carbohydrates": 5, + "protein": 5, + "fat": 0, + "vitamins": 5, + "minerals": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..b061969 --- /dev/null +++ b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "pack_format": 15, + "description": { + "text": "natures spirit nutritionz compat" + } + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.png b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.png new file mode 100644 index 0000000..25b6b06 Binary files /dev/null and b/src/main/resources/resourcepacks/natures_spirit_nutrition_compat/pack.png differ