updated to 1.0.7

xR4YM0ND · Jun 8, 2024 · 4ac982c · 4ac982c
1 parent 9935f8e
commit 4ac982c
Show file tree

Hide file tree

Showing 59 changed files with 2,257 additions and 710 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
-### Added:
-- Nature's Spirit `1.4.5` compat
-### Updated:
-- [Let's Do] Meadow `1.3.14` compat
-- [Let's Do] Vinery `1.4.19` compat
+## Fixed:
+- Wrong expanded delight values
+- Wrong farmers delight refabricated values
+
+## Added:
+- Brewin' and Chewin' `3.0.3` compat
+- Cultural Delights `1.0.0` compat
+- End's Delight `alpha 1.0` compat
+- Festive Delight `1.1.0` compat
+- More Delight `1.2.2` compat
+- Nethers Delight Refabricated `4.1.1` compat
+- Ocean's Delight `1.0.2` compat
+- Spelunkery `0.3.5` compat
+- Ube's Delight `0.1.5.4` compat
+- Wilder Wild `2.4.2` compat
+
+## Updated:
+- [Let's Do] Bakery `1.1.11` compat
+- [Let's Do] Meadow `1.3.16` compat
+- Expanded Delight `0.3.1` compat
+- Farmers Delight Refabricated `2.1.1` compat
+- Natures Spirit `1.5.3` compat
diff --git a/gallery/nutritionz_400x400.png b/gallery/nutritionz_400x400.png
diff --git a/gallery/nutritionz_800x800.png b/gallery/nutritionz_800x800.png
diff --git 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.6
+    mod_version=1.0.7
     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
@@ -33,11 +33,9 @@ public static void init() {
                 }
             });
         }
-        // datapacks
-        if (FabricLoader.getInstance().isModLoaded("adventurez")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "adventurez_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
-                    ResourcePackActivationType.DEFAULT_ENABLED);
-        }
+        // DATAPACKS
+        //
+        // [Lets Do Series]
         if (FabricLoader.getInstance().isModLoaded("bakery")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "bakery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
@@ -46,14 +44,6 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "beachparty_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
-        if (FabricLoader.getInstance().isModLoaded("betterend")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betterend_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
-                    ResourcePackActivationType.DEFAULT_ENABLED);
-        }
-        if (FabricLoader.getInstance().isModLoaded("betternether")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betternether_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
-                    ResourcePackActivationType.DEFAULT_ENABLED);
-        }
         if (FabricLoader.getInstance().isModLoaded("brewery")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "brewery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
@@ -62,10 +52,6 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "candlelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
-        if (FabricLoader.getInstance().isModLoaded("dehydration")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_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);
@@ -78,6 +64,35 @@ 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("herbalbrews")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "herbalbrews_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("meadow")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "meadow_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);
+        }
+        if (FabricLoader.getInstance().isModLoaded("vinery")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "vinery_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(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("culturaldelights")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "culturaldelights_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("ends_delight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "endsdelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
         if (FabricLoader.getInstance().isModLoaded("expandeddelight")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "expandeddelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
@@ -86,16 +101,45 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "farmersdelight_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(),
+        if (FabricLoader.getInstance().isModLoaded("festive_delight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "festivedelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
-        if (FabricLoader.getInstance().isModLoaded("hybrid-aquatic")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "hybrid-aquatic_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+        if (FabricLoader.getInstance().isModLoaded("moredelight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "moredelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
-        if (FabricLoader.getInstance().isModLoaded("meadow")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "meadow_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+        if (FabricLoader.getInstance().isModLoaded("nethersdelight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "nethersdelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("oceansdelight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "oceansdelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("ubesdelight")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "ubesdelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        // Others
+        if (FabricLoader.getInstance().isModLoaded("adventurez")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "adventurez_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("betterend")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betterend_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("betternether")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betternether_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("dehydration")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
+        if (FabricLoader.getInstance().isModLoaded("hybrid-aquatic")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "hybrid-aquatic_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
         if (FabricLoader.getInstance().isModLoaded("mobcatalog")) {
@@ -110,20 +154,20 @@ public static void init() {
             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);
-        }
         if (FabricLoader.getInstance().isModLoaded("regions_unexplored")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "regions_unexplored_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
+        if (FabricLoader.getInstance().isModLoaded("spelunkery")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "spelunkery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
         if (FabricLoader.getInstance().isModLoaded("supplementaries")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "supplementaries_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
-        if (FabricLoader.getInstance().isModLoaded("vinery")) {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "vinery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+        if (FabricLoader.getInstance().isModLoaded("wilderwild")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "wilderwild_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
     }

diff --git a/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.png b/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.png
diff --git a/...n/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json b/...n/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json
@@ -74,7 +74,7 @@
         "protein": 10,
         "fat": 5,
         "vitamins": 0,
-        "minerals": 5
+        "minerals": 0
     },
     "bakery:strawberry_cake_slice": {
         "carbohydrates": 10,

diff --git a/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.png b/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.png
diff --git a/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.png b/src/main/resources/resourcepacks/beachparty_nutrition_compat/pack.png
diff --git a/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.png b/src/main/resources/resourcepacks/betterend_nutrition_compat/pack.png
diff --git a/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.png b/src/main/resources/resourcepacks/betternether_nutrition_compat/pack.png
diff --git a/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.png b/src/main/resources/resourcepacks/brewery_nutrition_compat/pack.png
diff --git a/...ewinandchewin_nutrition_compat/data/brewinandchewin/nutrition/brewinandchewin_blocks.json b/...ewinandchewin_nutrition_compat/data/brewinandchewin/nutrition/brewinandchewin_blocks.json
@@ -0,0 +1,9 @@
+{
+    "brewinandchewin:quiche": {
+        "carbohydrates": 0,
+        "protein": 5,
+        "fat": 5,
+        "vitamins": 5,
+        "minerals": 0
+    }
+}
diff --git a/...rewinandchewin_nutrition_compat/data/brewinandchewin/nutrition/brewinandchewin_items.json b/...rewinandchewin_nutrition_compat/data/brewinandchewin/nutrition/brewinandchewin_items.json
@@ -0,0 +1,121 @@
+{
+    "brewinandchewin:saccharine_rum": {
+        "carbohydrates": 15,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 10,
+        "minerals": 5
+    },
+    "brewinandchewin:kimchi": {
+        "carbohydrates": 3,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 4,
+        "minerals": 3
+    },
+    "brewinandchewin:jerky": {
+        "carbohydrates": 0,
+        "protein": 10,
+        "fat": 0,
+        "vitamins": 0,
+        "minerals": 5
+    },
+    "brewinandchewin:pickled_pickles": {
+        "carbohydrates": 10,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 5,
+        "minerals": 5
+    },
+    "brewinandchewin:kippers": {
+        "carbohydrates": 0,
+        "protein": 10,
+        "fat": 0,
+        "vitamins": 0,
+        "minerals": 20
+    },
+    "brewinandchewin:cocoa_fudge": {
+        "carbohydrates": 15,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 0,
+        "minerals": 5
+    },
+    "brewinandchewin:flaxen_cheese_wedge": {
+        "carbohydrates": 0,
+        "protein": 5,
+        "fat": 15,
+        "vitamins": 0,
+        "minerals": 0
+    },
+    "brewinandchewin:scarlet_cheese_wedge": {
+        "carbohydrates": 0,
+        "protein": 5,
+        "fat": 10,
+        "vitamins": 0,
+        "minerals": 5
+    },
+    "brewinandchewin:fiery_fondue": {
+        "carbohydrates": 20,
+        "protein": 10,
+        "fat": 10,
+        "vitamins": 10,
+        "minerals": 30
+    },
+    "brewinandchewin:quiche_slice": {
+        "carbohydrates": 0,
+        "protein": 5,
+        "fat": 5,
+        "vitamins": 5,
+        "minerals": 0
+    },
+    "brewinandchewin:vegetable_omelet": {
+        "carbohydrates": 5,
+        "protein": 15,
+        "fat": 25,
+        "vitamins": 10,
+        "minerals": 5
+    },
+    "brewinandchewin:cheesy_pasta": {
+        "carbohydrates": 10,
+        "protein": 10,
+        "fat": 15,
+        "vitamins": 20,
+        "minerals": 5
+    },
+    "brewinandchewin:creamy_onion_soup": {
+        "carbohydrates": 10,
+        "protein": 15,
+        "fat": 20,
+        "vitamins": 10,
+        "minerals": 5
+    },
+    "brewinandchewin:scarlet_pierogies": {
+        "carbohydrates": 10,
+        "protein": 10,
+        "fat": 15,
+        "vitamins": 5,
+        "minerals": 30
+    },
+    "brewinandchewin:horror_lasagna": {
+        "carbohydrates": 20,
+        "protein": 20,
+        "fat": 10,
+        "vitamins": 10,
+        "minerals": 10
+    },
+    "brewinandchewin:pizza_slice": {
+        "carbohydrates": 5,
+        "protein": 5,
+        "fat": 0,
+        "vitamins": 5,
+        "minerals": 0
+    },
+    "brewinandchewin:ham_and_cheese_sandwich": {
+        "carbohydrates": 10,
+        "protein": 10,
+        "fat": 20,
+        "vitamins": 0,
+        "minerals": 5
+    }
+}
diff --git a/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/brewinandchewin_nutrition_compat/pack.mcmeta
@@ -0,0 +1,8 @@
+{
+  "pack": {
+    "pack_format": 15,
+    "description": {
+        "text": "Brewin and Chewin compat for Nutritionz"
+    }
+  }
+}
diff --git a/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.png b/src/main/resources/resourcepacks/candlelight_nutrition_compat/pack.png